chore(ci): make cache restore keys more specific

nextstrain · Dec 6, 2022 · b296c58 · b296c58
1 parent ab2a36d
commit b296c58
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/builder-docker-image.yml b/.github/workflows/builder-docker-image.yml
@@ -47,6 +47,7 @@ jobs:
           path: .cache/docker/buildx
           key: cache-v1-buildx-${{ runner.os }}-${{ steps.docker-build-checksum.outputs.checksum }}
           restore-keys: |
+            cache-v1-buildx-${{ runner.os }}-${{ steps.docker-build-checksum.outputs.checksum }}
             cache-v1-buildx-${{ runner.os }}-
 
       - name: "Build image: base"

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -84,7 +84,9 @@ jobs:
           path: .cache/docker/buildx
           key: cache-v1-buildx-${{ runner.os }}-${{ matrix.arch }}-${{ steps.docker-build-checksum.outputs.checksum }}
           restore-keys: |
+            cache-v1-buildx-${{ runner.os }}-${{ matrix.arch }}-${{ steps.docker-build-checksum.outputs.checksum }}
             cache-v1-buildx-${{ runner.os }}-${{ matrix.arch }}-
+            cache-v1-buildx-${{ runner.os }}-${{ steps.docker-build-checksum.outputs.checksum }}
             cache-v1-buildx-${{ runner.os }}-
 
       - name: "Setup cache for Rust and Cargo"
@@ -95,6 +97,7 @@ jobs:
             .build/
           key: cache-v1-cargo-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
+            cache-v1-cargo-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('**/Cargo.lock') }}
             cache-v1-cargo-${{ runner.os }}-${{ matrix.arch }}-
             cache-v1-cargo-${{ runner.os }}-
 

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -86,7 +86,9 @@ jobs:
           path: .cache/docker/buildx
           key: cache-v1-buildx-${{ runner.os }}-wasm32-unknown-unknown-${{ steps.docker-build-checksum.outputs.checksum }}
           restore-keys: |
+            cache-v1-buildx-${{ runner.os }}-wasm32-unknown-unknown-${{ steps.docker-build-checksum.outputs.checksum }}
             cache-v1-buildx-${{ runner.os }}-wasm32-unknown-unknown-
+            cache-v1-buildx-${{ runner.os }}-${{ steps.docker-build-checksum.outputs.checksum }}
             cache-v1-buildx-${{ runner.os }}-
 
       - name: "Setup cache for Rust and Cargo"
@@ -98,6 +100,7 @@ jobs:
             packages_rs/nextclade-web/.build/docker
           key: cache-v1-cargo-${{ runner.os }}-wasm32-unknown-unknown-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
+            cache-v1-cargo-${{ runner.os }}-wasm32-unknown-unknown-${{ hashFiles('**/Cargo.lock') }}
             cache-v1-cargo-${{ runner.os }}-wasm32-unknown-unknown-
             cache-v1-cargo-${{ runner.os }}-
 
@@ -110,6 +113,7 @@ jobs:
             packages_rs/nextclade-web/node_modules
           key: cache-v1-web-${{ runner.os }}-wasm32-unknown-unknown-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
+            cache-v1-web-${{ runner.os }}-wasm32-unknown-unknown-${{ hashFiles('**/yarn.lock') }}
             cache-v1-web-${{ runner.os }}-wasm32-unknown-unknown-
             cache-v1-web-${{ runner.os }}-