From 3f52fb7969b56aca1bf8c94258128393e22f9da7 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail@gmail.com>
Date: Wed, 8 Jul 2020 12:20:31 +0200
Subject: [PATCH] Show stats on linux / windows

---
 scripts/buildkite/build_branch_pipeline.py |  1 +
 scripts/buildkite/build_master_pipeline.py | 12 ++++++++----
 scripts/windows_agent_start_buildkite.ps1  |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/buildkite/build_branch_pipeline.py b/scripts/buildkite/build_branch_pipeline.py
index 7357ae7..a3bd48e 100755
--- a/scripts/buildkite/build_branch_pipeline.py
+++ b/scripts/buildkite/build_branch_pipeline.py
@@ -20,6 +20,7 @@ if __name__ == '__main__':
     script_branch = os.getenv("scripts_branch", "master")
     queue_prefix = os.getenv("ph_queue_prefix", "")
     diff_id = os.getenv("ph_buildable_diff", "")
+
     steps = []
     linux_buld_step = {
         'label': ':linux: build and test linux',
diff --git a/scripts/buildkite/build_master_pipeline.py b/scripts/buildkite/build_master_pipeline.py
index d513cf5..17d632a 100755
--- a/scripts/buildkite/build_master_pipeline.py
+++ b/scripts/buildkite/build_master_pipeline.py
@@ -27,13 +27,17 @@ if __name__ == '__main__':
         'key': 'linux',
         'commands': [
             'ccache --clear' if no_cache else '',
+            'ccache --zero-stats',
             'mkdir -p artifacts',
             'dpkg -l >> artifacts/packages.txt',
             'export SRC=${BUILDKITE_BUILD_PATH}/llvm-premerge-checks',
             'rm -rf ${SRC}',
             'git clone --depth 1 --branch ${scripts_branch} https://github.com/google/llvm-premerge-checks.git ${SRC}',
-            '${SRC}/scripts/premerge_checks.py '
-            f'--projects="{projects}"',
+            f'${{SRC}}/scripts/premerge_checks.py --projects="{projects}"',
+            'EXIT_STATUS=\\$?',
+            'echo "--- ccache stats"',
+            'ccache --show-stats',
+            'exit \\$EXIT_STATUS',
         ],
         'artifact_paths': ['artifacts/**/*', '*_result.json'],
         'agents': {'queue': f'{queue_prefix}linux'},
@@ -51,9 +55,9 @@ if __name__ == '__main__':
             'set SRC=%BUILDKITE_BUILD_PATH%/llvm-premerge-checks',
             'rm -rf %SRC%',
             'git clone --depth 1 --branch %scripts_branch% https://github.com/google/llvm-premerge-checks.git %SRC%',
-            'powershell -command "%SRC%/scripts/premerge_checks.py '
-            f'--projects=\'{projects}\'; '
+            f'powershell -command "%SRC%/scripts/premerge_checks.py --projects=\'{projects}\'; '
             '\\$exit=\\$?;'
+            'echo \'--- sccache stats\';'
             'sccache --show-stats;'
             'if (\\$exit) {'
             '  echo success;'
diff --git a/scripts/windows_agent_start_buildkite.ps1 b/scripts/windows_agent_start_buildkite.ps1
index 70361a8..542b6b8 100644
--- a/scripts/windows_agent_start_buildkite.ps1
+++ b/scripts/windows_agent_start_buildkite.ps1
@@ -27,7 +27,7 @@ $IMAGE="gcr.io/llvm-premerge-checks/${NAME}:${version}"
 Write-Output "Authenticating docker..."
 Write-Output "y`n" | gcloud auth configure-docker
 
-Write-Output "Pulling new image..."
+Write-Output "Pulling new image '${IMAGE}'..."
 docker pull ${IMAGE}
 Write-Output "Stopping old container..."
 docker stop ${NAME}