feat: add arch to cache key

actions · Sep 8, 2024 · 4cd5bdc · 4cd5bdc
1 parent 6bd8b7f
commit 4cd5bdc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);