Try new caching keys.

TGBP · Mar 5, 2018 · d8bfa02 · d8bfa02
1 parent 9d67e9b
commit d8bfa02
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/circle.yml b/circle.yml
@@ -96,14 +96,16 @@ jobs:
             if [ "$CIRCLE_BRANCH" = release -o -n "$CIRCLE_TAG" ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi
             echo -n "$CIRCLE_SHA1" > commit_hash.txt
       - restore_cache:
-          key: ccache-{{ arch }}-{{ .Branch }}
-          key: ccache-{{ arch }}
-          key: ccache
+          key: ccache-{{ arch }}-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+          key: ccache-{{ arch }}-{{ .Branch }}-
+          key: ccache-{{ arch }}-develop-
+          key: ccache-{{ arch }}-
       - run:
           name: Build
           command: ./scripts/build.sh RelWithDebInfo
       - save_cache:
-          key: ccache-{{ arch }}-{{ .Branch }}
+          key: ccache-{{ arch }}-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+          when: always
           paths:
             - ~/.ccache
       - store_artifacts: