CI: Improve caching

The cache key now depends on the Rust version.
hhuOS · Jun 14, 2024 · 6eaa050 · 6eaa050
1 parent d9429a7
commit 6eaa050
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,15 +5,12 @@ jobs:
         runs-on: ubuntu-24.04
         steps:
             - uses: actions/checkout@v4
+            - name: Install Rust
+              uses: dtolnay/rust-toolchain@nightly
             - name: Cache Cargo
-              uses: actions/cache@v4
+              uses: Swatinem/rust-cache@v2
               with:
-                path: |
-                  ~/.cargo/registry/index/
-                  ~/.cargo/registry/cache/
-                  ~/.cargo/git/db/
-                  target/
-                key: cargo-${{ hashFiles('**/Cargo.lock') }}
+                shared-key: cargo-${{ hashFiles('**/Cargo.lock') }}
             - name: Install qemu
               run: sudo apt-get update && sudo apt-get install -y qemu-system-x86
             - name: Enable KVM group perms
@@ -36,15 +33,12 @@ jobs:
         needs: test
         steps:
             - uses: actions/checkout@v4
+            - name: Install Rust
+              uses: dtolnay/rust-toolchain@nightly
             - name: Cache Cargo
-              uses: actions/cache@v4
+              uses: Swatinem/rust-cache@v2
               with:
-                path: |
-                  ~/.cargo/registry/index/
-                  ~/.cargo/registry/cache/
-                  ~/.cargo/git/db/
-                  target/
-                key: cargo-${{ hashFiles('**/Cargo.lock') }}
+                shared-key: cargo-${{ hashFiles('**/Cargo.lock') }}
             - name: Build for i686
               uses: clechasseur/rs-cargo@v2
               with:
@@ -100,19 +94,14 @@ jobs:
       needs: test
       steps:
           - uses: actions/checkout@v4
-          - name: Cache Cargo
-            uses: actions/cache@v4
-            with:
-              path: |
-                ~/.cargo/registry/index/
-                ~/.cargo/registry/cache/
-                ~/.cargo/git/db/
-                target/
-              key: cargo-${{ hashFiles('**/Cargo.lock') }}
           - name: Install Rust for x86_64-apple and aarch64-apple
             uses: dtolnay/rust-toolchain@nightly
             with:
                 targets: x86_64-apple-darwin, aarch64-apple-darwin
+          - name: Cache Cargo
+            uses: Swatinem/rust-cache@v2
+            with:
+              shared-key: cargo-${{ hashFiles('**/Cargo.lock') }}
           - name: Build towbootctl for x86_64-apple
             uses: clechasseur/rs-cargo@v2
             with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,15 +7,12 @@ jobs:
         runs-on: ubuntu-24.04
         steps:
             - uses: actions/checkout@v4
+            - name: Install Rust
+              uses: dtolnay/rust-toolchain@nightly
             - name: Cache Cargo
-              uses: actions/cache@v4
+              uses: Swatinem/rust-cache@v2
               with:
-                path: |
-                  ~/.cargo/registry/index/
-                  ~/.cargo/registry/cache/
-                  ~/.cargo/git/db/
-                  target/
-                key: cargo-${{ vars.GITHUB_RUN_ID }}-${{ hashFiles('**/Cargo.lock') }}
+                shared-key: cargo-${{ vars.GITHUB_RUN_ID }}-${{ hashFiles('**/Cargo.lock') }}
             - name: Install qemu
               run: sudo apt-get update && sudo apt-get install -y qemu-system-x86
             - name: Enable KVM group perms
@@ -38,15 +35,12 @@ jobs:
         needs: test
         steps:
             - uses: actions/checkout@v4
+            - name: Install Rust
+              uses: dtolnay/rust-toolchain@nightly
             - name: Cache Cargo
-              uses: actions/cache@v4
+              uses: Swatinem/rust-cache@v2
               with:
-                path: |
-                  ~/.cargo/registry/index/
-                  ~/.cargo/registry/cache/
-                  ~/.cargo/git/db/
-                  target/
-                key: cargo-${{ vars.GITHUB_RUN_ID }}-${{ hashFiles('**/Cargo.lock') }}
+                shared-key: cargo-${{ vars.GITHUB_RUN_ID }}-${{ hashFiles('**/Cargo.lock') }}
             - name: Build for i686
               uses: clechasseur/rs-cargo@v2
               with:
@@ -99,19 +93,14 @@ jobs:
         needs: release
         steps:
             - uses: actions/checkout@v4
-            - name: Cache Cargo
-              uses: actions/cache@v4
-              with:
-                path: |
-                  ~/.cargo/registry/index/
-                  ~/.cargo/registry/cache/
-                  ~/.cargo/git/db/
-                  target/
-                key: cargo-${{ vars.GITHUB_RUN_ID }}-${{ hashFiles('**/Cargo.lock') }}
             - name: Install Rust for x86_64-apple and aarch64-apple
               uses: dtolnay/rust-toolchain@nightly
               with:
                 targets: x86_64-apple-darwin, aarch64-apple-darwin
+            - name: Cache Cargo
+              uses: Swatinem/rust-cache@v2
+              with:
+                shared-key: cargo-${{ vars.GITHUB_RUN_ID }}-${{ hashFiles('**/Cargo.lock') }}
             - name: Build towbootctl for x86_64-apple
               uses: clechasseur/rs-cargo@v2
               with: