Use new cache keys

Author: griggt

.github/workflows/ci.yaml

@@ -41,22 +41,22 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /root/.ivy2/cache
-          key: ${{ runner.os }}-ivy-${{ hashFiles('**/build.sbt') }}
-          restore-keys: ${{ runner.os }}-ivy-
+          key: ${{ runner.os }}-ivy-test-${{ hashFiles('**/build.sbt') }}
+          restore-keys: ${{ runner.os }}-ivy-test-
 
       - name: Cache SBT
         uses: actions/cache@v2
         with:
           path: /root/.sbt
-          key: ${{ runner.os }}-sbt-${{ hashFiles('project/**') }}
-          restore-keys: ${{ runner.os }}-sbt-
+          key: ${{ runner.os }}-sbt-test-${{ hashFiles('project/**') }}
+          restore-keys: ${{ runner.os }}-sbt-test-
 
       - name: Cache Coursier and Mill
         uses: actions/cache@v2
         with:
           path: /root/.cache
-          key: ${{ runner.os }}-general-${{ hashFiles('**/build.sbt') }}
-          restore-keys: ${{ runner.os }}-general-
+          key: ${{ runner.os }}-general-test-${{ hashFiles('**/build.sbt') }}
+          restore-keys: ${{ runner.os }}-general-test-
 
       - name: Test
         run: |
@@ -86,22 +86,24 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /root/.ivy2/cache
-          key: ${{ runner.os }}-ivy-${{ hashFiles('**/build.sbt') }}
-          restore-keys: ${{ runner.os }}-ivy-
+          key: ${{ runner.os }}-ivy-test-${{ hashFiles('**/build.sbt') }}
+          restore-keys: ${{ runner.os }}-ivy-test-
 
       - name: Cache SBT
         uses: actions/cache@v2
         with:
           path: /root/.sbt
-          key: ${{ runner.os }}-sbt-${{ hashFiles('project/**') }}
-          restore-keys: ${{ runner.os }}-sbt-
+          key: ${{ runner.os }}-sbt-test-${{ hashFiles('project/**') }}
+          restore-keys: ${{ runner.os }}-sbt-test-
 
       - name: Cache Coursier and Mill
         uses: actions/cache@v2
         with:
           path: /root/.cache
-          key: ${{ runner.os }}-general-${{ hashFiles('**/build.sbt') }}
-          restore-keys: ${{ runner.os }}-general-
+          key: ${{ runner.os }}-general-bs-${{ hashFiles('**/build.sbt') }}
+          restore-keys: |
+            ${{ runner.os }}-general-bs-
+            ${{ runner.os }}-general-test-
 
       - name: Test
         run: |
@@ -171,22 +173,24 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /root/.ivy2/cache
-          key: ${{ runner.os }}-ivy-${{ hashFiles('**/build.sbt') }}
-          restore-keys: ${{ runner.os }}-ivy-
+          key: ${{ runner.os }}-ivy-cb-${{ hashFiles('**/build.sbt') }}
+          restore-keys: ${{ runner.os }}-ivy-cb-
 
       - name: Cache SBT
         uses: actions/cache@v2
         with:
           path: /root/.sbt
-          key: ${{ runner.os }}-sbt-${{ hashFiles('project/**') }}
-          restore-keys: ${{ runner.os }}-sbt-
+          key: ${{ runner.os }}-sbt-cb-${{ hashFiles('project/**') }}
+          restore-keys: ${{ runner.os }}-sbt-cb-
 
       - name: Cache Coursier and Mill
         uses: actions/cache@v2
         with:
           path: /root/.cache
-          key: ${{ runner.os }}-general-${{ hashFiles('**/build.sbt') }}
-          restore-keys: ${{ runner.os }}-general-
+          key: ${{ runner.os }}-general-cba-${{ hashFiles('**/build.sbt') }}
+          restore-keys: |
+            ${{ runner.os }}-general-cba-
+            ${{ runner.os }}-general-test-
 
       - name: Test
         run: |
@@ -215,22 +219,24 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /root/.ivy2/cache
-          key: ${{ runner.os }}-ivy-${{ hashFiles('**/build.sbt') }}
-          restore-keys: ${{ runner.os }}-ivy-
+          key: ${{ runner.os }}-ivy-cb-${{ hashFiles('**/build.sbt') }}
+          restore-keys: ${{ runner.os }}-ivy-cb-
 
       - name: Cache SBT
         uses: actions/cache@v2
         with:
           path: /root/.sbt
-          key: ${{ runner.os }}-sbt-${{ hashFiles('project/**') }}
-          restore-keys: ${{ runner.os }}-sbt-
+          key: ${{ runner.os }}-sbt-cb-${{ hashFiles('project/**') }}
+          restore-keys: ${{ runner.os }}-sbt-cb-
 
       - name: Cache Coursier and Mill
         uses: actions/cache@v2
         with:
           path: /root/.cache
-          key: ${{ runner.os }}-general-${{ hashFiles('**/build.sbt') }}
-          restore-keys: ${{ runner.os }}-general-
+          key: ${{ runner.os }}-general-cbb-${{ hashFiles('**/build.sbt') }}
+          restore-keys: |
+            ${{ runner.os }}-general-cbb-
+            ${{ runner.os }}-general-test-
 
       - name: Test
         run: |