From 86db75e86c1119cb51c1c1f1ebdd82faf7c06842 Mon Sep 17 00:00:00 2001
From: "Sam A. Horvath-Hunt" <hello@samhh.com>
Date: Thu, 25 Apr 2024 11:11:17 +0100
Subject: [PATCH] Specify arch in CI cache keys

Since we're now multi-arch in CI.
---
 .github/actions/cabal-cache/action.yml | 8 ++++----
 .github/workflows/check.yml            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/actions/cabal-cache/action.yml b/.github/actions/cabal-cache/action.yml
index 9bbb41a..b9a0642 100644
--- 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
index 7ac4940..3781ad1 100644
--- 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