Merge pull request #38 from jeremydk/main

Fix macos cache key collision.
progre · Aug 7, 2024 · 0c2b8f2 · 0c2b8f2
2 parents 5a4e8e1 + e96469b
commit 0c2b8f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,12 +15,16 @@ jobs:
         include:
           - platform: 'macos-latest'
             args: '--target aarch64-apple-darwin'
+            cache_key: 'aarch64'
           - platform: 'macos-latest'
             args: '--target x86_64-apple-darwin'
+            cache_key: 'x86_84'
           - platform: 'ubuntu-22.04'
             args: ''
+            cache_key: ''
           - platform: 'windows-latest'
             args: ''
+            cache_key: ''
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -33,7 +37,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             src-tauri/target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ matrix.cache_key }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: setup node
         uses: actions/setup-node@v4

diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml
@@ -14,6 +14,7 @@ jobs:
         include:
           - platform: 'ubuntu-22.04'
             args: ''
+            cache_key: ''
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -26,7 +27,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             src-tauri/target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ matrix.cache_key }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: setup node
         uses: actions/setup-node@v4
         with: