From 4cd5bdca49a7de0c41198a180105d80acd125c04 Mon Sep 17 00:00:00 2001
From: Zxilly <31370133+Zxilly@users.noreply.github.com>
Date: Sun, 8 Sep 2024 10:32:41 +0000
Subject: [PATCH] feat: add arch to cache key

---
 __tests__/cache-restore.test.ts | 4 ++--
 dist/setup/index.js             | 3 ++-
 src/cache-restore.ts            | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/__tests__/cache-restore.test.ts b/__tests__/cache-restore.test.ts
index ab25a7233..19f487413 100644
--- a/__tests__/cache-restore.test.ts
+++ b/__tests__/cache-restore.test.ts
@@ -50,7 +50,7 @@ describe('cache-restore tests', () => {
 
       await restoreCache(lockFilePattern);
 
-      const expectedKey = `dotnet-cache-${process.env.RUNNER_OS}-hash`;
+      const expectedKey = `dotnet-cache-${process.env.RUNNER_OS}-${process.arch}-hash`;
       expect(jest.mocked(core.saveState)).toHaveBeenCalledWith(
         'CACHE_KEY',
         expectedKey
@@ -66,7 +66,7 @@ describe('cache-restore tests', () => {
     });
 
     it('calls core.saveState("CACHE_RESULT") when cache.restoreCache() returns key', async () => {
-      const expectedKey = `dotnet-cache-${process.env.RUNNER_OS}-hash`;
+      const expectedKey = `dotnet-cache-${process.env.RUNNER_OS}-${process.arch}-hash`;
       jest.mocked(glob.hashFiles).mockResolvedValue('hash');
       jest.mocked(cache.restoreCache).mockResolvedValue(expectedKey);
 
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 405862d3b..3bfc535e5 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -93479,7 +93479,8 @@ const restoreCache = (cacheDependencyPath) => __awaiter(void 0, void 0, void 0,
         throw new Error('Some specified paths were not resolved, unable to cache dependencies.');
     }
     const platform = process.env.RUNNER_OS;
-    const primaryKey = `dotnet-cache-${platform}-${fileHash}`;
+    const arch = process.arch;
+    const primaryKey = `dotnet-cache-${platform}-${arch}-${fileHash}`;
     core.debug(`primary key is ${primaryKey}`);
     core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
     const { 'global-packages': cachePath } = yield (0, cache_utils_1.getNuGetFolderPath)();
diff --git a/src/cache-restore.ts b/src/cache-restore.ts
index a9763e0af..90560c8d4 100644
--- a/src/cache-restore.ts
+++ b/src/cache-restore.ts
@@ -17,7 +17,8 @@ export const restoreCache = async (cacheDependencyPath?: string) => {
   }
 
   const platform = process.env.RUNNER_OS;
-  const primaryKey = `dotnet-cache-${platform}-${fileHash}`;
+  const arch = process.arch;
+  const primaryKey = `dotnet-cache-${platform}-${arch}-${fileHash}`;
   core.debug(`primary key is ${primaryKey}`);
 
   core.saveState(State.CachePrimaryKey, primaryKey);