From 06e202441e9ba5bfc87a5be7c7e157fff61a6264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 13 Jul 2017 16:44:45 +0200
Subject: [build] upload cache on Circle CI before running tests

---
 circle.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'circle.yml')

diff --git a/circle.yml b/circle.yml
index 7722bc2115..81826102e5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -137,11 +137,11 @@ jobs:
       - run:
           name: Generate compilation database
           command: make compdb
+      - *show-ccache-stats
+      - *save-cache
       - run:
           name: Run Clang checks
           command: make check
-      - *show-ccache-stats
-      - *save-cache
 
 # ------------------------------------------------------------------------------
   android-debug-arm-v7:
@@ -276,9 +276,9 @@ jobs:
       - *reset-ccache-stats
       - *build-node
       - *show-ccache-stats
+      - *save-cache
       - *run-node-tests
       - *publish-node-package
-      - *save-cache
       - *upload-render-tests
 
 # ------------------------------------------------------------------------------
@@ -300,9 +300,9 @@ jobs:
       - *reset-ccache-stats
       - *build-node
       - *show-ccache-stats
+      - *save-cache
       - *run-node-tests
       - *publish-node-package
-      - *save-cache
       - *upload-render-tests
 
 # ------------------------------------------------------------------------------
@@ -324,9 +324,9 @@ jobs:
       - *reset-ccache-stats
       - *build-node
       - *show-ccache-stats
+      - *save-cache
       - *run-node-tests
       - *publish-node-package
-      - *save-cache
       - *upload-render-tests
 
 # ------------------------------------------------------------------------------
@@ -348,8 +348,8 @@ jobs:
       - *build-benchmark
       - *build-test
       - *show-ccache-stats
-      - *run-unit-tests
       - *save-cache
+      - *run-unit-tests
 
 # ------------------------------------------------------------------------------
   linux-clang4-sanitize-address:
@@ -373,13 +373,13 @@ jobs:
       - *setup-llvm-symbolizer
       - *build-test
       - *show-ccache-stats
+      - *save-cache
       - run:
           name: Run tests
           command: |
             xvfb-run --server-args="-screen 0 1024x768x24" make run-test 2> >(tee sanitizer 1>&2)
             # Unfortunately, Google Test eats the status code, so we'll have to check the output.
             [ -z "$(sed -n '/^SUMMARY: AddressSanitizer:/p' sanitizer)" ]
-      - *save-cache
 
 # ------------------------------------------------------------------------------
   linux-clang4-sanitize-undefined:
@@ -403,13 +403,13 @@ jobs:
       - *setup-llvm-symbolizer
       - *build-test
       - *show-ccache-stats
+      - *save-cache
       - run:
           name: Run tests
           command: |
             xvfb-run --server-args="-screen 0 1024x768x24" make run-test 2> >(tee sanitizer 1>&2)
             # Unfortunately, Google Test eats the status code, so we'll have to check the output.
             [ -z "$(sed -n '/^SUMMARY: UndefinedBehaviorSanitizer:/p' sanitizer)" ]
-      - *save-cache
 
 # ------------------------------------------------------------------------------
   linux-clang4-sanitize-thread:
@@ -484,12 +484,13 @@ jobs:
       - *build-linux
       - *build-benchmark
       - *build-test
+      - *show-ccache-stats
+      - *save-cache
       - *run-unit-tests
       - run:
           name: Upload coverage results to coveralls
           command: |
             platform/linux/scripts/coveralls.sh
-      - *save-cache
 
 # ------------------------------------------------------------------------------
   linux-gcc5-release-qt4:
@@ -510,13 +511,13 @@ jobs:
       - *build-qt-app
       - *build-qt-test
       - *show-ccache-stats
+      - *save-cache
       - run:
           name: Run memory-load tests
           command: |
             xvfb-run --server-args="-screen 0 1024x768x24" \
               make run-qt-test-Memory.*:*.Load
             scripts/log_memory_benchmarks.sh test_detail.xml "Platform=Linux,Compiler=${_CC},Arch=$(uname -m)"
-      - *save-cache
 
 # ------------------------------------------------------------------------------
   linux-gcc5-release-qt5:
@@ -539,6 +540,7 @@ jobs:
           name: Build qt-docs
           command: make qt-docs
       - *show-ccache-stats
+      - *save-cache
       - run:
           name: Run valgrind-backed tests
           environment:
@@ -546,4 +548,3 @@ jobs:
           command: |
             xvfb-run --server-args="-screen 0 1024x768x24" \
               scripts/valgrind.sh build/qt-linux-x86_64/Release/mbgl-test --gtest_filter=-*.Load --gtest_filter=-Memory.Vector
-      - *save-cache
-- 
cgit v1.2.1