Specify arch in CI cache keys

Since we're now multi-arch in CI.
unsplash · Apr 25, 2024 · 86db75e · 86db75e
1 parent 8bac440
commit 86db75e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/actions/cabal-cache/action.yml b/.github/actions/cabal-cache/action.yml
@@ -6,13 +6,13 @@ runs:
       uses: actions/cache@v4
       with:
         path: ~/.local/state/cabal/store/
-        key: cabal-${{ runner.os }}-${{ hashFiles('cabal.project.freeze') }}
+        key: cabal-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('cabal.project.freeze') }}
         restore-keys: |
-          cabal-${{ runner.os }}
+          cabal-${{ runner.os }}-${{ runner.arch }}
     - name: Cache incremental build
       uses: actions/cache@v4
       with:
         path: ./dist-newstyle/
-        key: dist-${{ runner.os }}-${{ github.sha }}
+        key: dist-${{ runner.os }}-${{ runner.arch }}-${{ github.sha }}
         restore-keys: |
-          dist-${{ runner.os }}
+          dist-${{ runner.os }}-${{ runner.arch }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -64,8 +64,8 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache/yarn/v6
-          key: yarn-${{ runner.os }}-${{ hashFiles('.golden/ts/yarn.lock') }}
+          key: yarn-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.golden/ts/yarn.lock') }}
           restore-keys: |
-            yarn-${{ runner.os }}
+            yarn-${{ runner.os }}-${{ runner.arch }}
       - run: nix develop .#golden -c yarn install --frozen-lockfile
       - run: nix develop .#golden -c yarn typecheck