Merge pull request torvalds#445 from libos-nuse/feature-clear-cache

lkl: add cache version to the source cache
lopsided98 · Jun 28, 2018 · 86dd3af · 86dd3af
2 parents ea9a4f4 + 4ad2c34
commit 86dd3af
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ do_steps: &do_steps
  steps:
   - run: echo "$CROSS_COMPILE" > ~/_cross_compile
   - restore_cache:
-      key: code-tree-shallow
+      key: code-tree-shallow-{{ .Environment.CACHE_VERSION }}
   - run:
       name: checkout build tree
       command: |
@@ -22,7 +22,7 @@ do_steps: &do_steps
         fi
         git reset --hard $CIRCLE_SHA1
   - save_cache:
-      key: code-tree-shallow-{{ epoch }}
+      key: code-tree-shallow-{{ .Environment.CACHE_VERSION }}-{{ epoch }}
       paths:
         - /home/ubuntu/project/.git
   - run:
@@ -33,7 +33,7 @@ do_steps: &do_steps
         rm -rf ~/junit
   - run: mkdir -p /home/ubuntu/.ccache
   - restore_cache:
-      key: compiler-cache-{{ checksum "~/_cross_compile" }}
+      key: compiler-cache-{{ checksum "~/_cross_compile" }}-{{ .Environment.CACHE_VERSION }}
   - run:
       name: build DPDK
       command: |
@@ -65,7 +65,7 @@ do_steps: &do_steps
   - save_cache:
      paths:
        - /home/ubuntu/.ccache
-     key: compiler-cache-{{ checksum "~/_cross_compile" }}-{{ epoch }}
+     key: compiler-cache-{{ checksum "~/_cross_compile" }}-{{ .Environment.CACHE_VERSION }}-{{ epoch }}
   - run:
       name: wait emulator to boot
       command: |
@@ -146,11 +146,11 @@ jobs:
    environment:
    steps:
      - restore_cache:
-        key: code-tree-full-history
+        key: code-tree-full-history-{{ .Environment.CACHE_VERSION }}
      - checkout
      - run: tools/lkl/scripts/checkpatch.sh
      - save_cache:
-        key: code-tree-full-history-{{ epoch }}
+        key: code-tree-full-history-{{ .Environment.CACHE_VERSION }}-{{ epoch }}
         paths:
           - /home/ubuntu/project/.git
         when: always