Include CPU arch in the cache key (#228)

rhysd · web-flow · commit 27b8ea9368cf · 2025-02-08T15:36:01.000+01:00
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -86755,9 +86755,10 @@ class CacheConfig {
                 key += `-${job}`;
             }
         }
-        // Add runner OS to the key to avoid cross-contamination of cache
+        // Add runner OS and CPU architecture to the key to avoid cross-contamination of cache
         const runnerOS = external_os_default().type();
-        key += `-${runnerOS}`;
+        const runnerArch = external_os_default().arch();
+        key += `-${runnerOS}-${runnerArch}`;
         self.keyPrefix = key;
         // Construct environment portion of the key:
         // This consists of a hash that considers the rust version
diff --git a/dist/save/index.js b/dist/save/index.js
@@ -86755,9 +86755,10 @@ class CacheConfig {
                 key += `-${job}`;
             }
         }
-        // Add runner OS to the key to avoid cross-contamination of cache
+        // Add runner OS and CPU architecture to the key to avoid cross-contamination of cache
         const runnerOS = external_os_default().type();
-        key += `-${runnerOS}`;
+        const runnerArch = external_os_default().arch();
+        key += `-${runnerOS}-${runnerArch}`;
         self.keyPrefix = key;
         // Construct environment portion of the key:
         // This consists of a hash that considers the rust version
diff --git a/src/config.ts b/src/config.ts
@@ -74,9 +74,10 @@ export class CacheConfig {
       }
     }
 
-    // Add runner OS to the key to avoid cross-contamination of cache
+    // Add runner OS and CPU architecture to the key to avoid cross-contamination of cache
     const runnerOS = os.type();
-    key += `-${runnerOS}`;
+    const runnerArch = os.arch();
+    key += `-${runnerOS}-${runnerArch}`;
 
     self.keyPrefix = key;
 

Original file line number	Diff line number	Diff line change
`@@ -86755,9 +86755,10 @@ class CacheConfig {`
`86755`	`86755`	key += `-${job}`;
`86756`	`86756`	`}`
`86757`	`86757`	`}`
`86758`		`- // Add runner OS to the key to avoid cross-contamination of cache`
	`86758`	`+ // Add runner OS and CPU architecture to the key to avoid cross-contamination of cache`
`86759`	`86759`	`const runnerOS = external_os_default().type();`
`86760`		- key += `-${runnerOS}`;
	`86760`	`+ const runnerArch = external_os_default().arch();`
	`86761`	+ key += `-${runnerOS}-${runnerArch}`;
`86761`	`86762`	`self.keyPrefix = key;`
`86762`	`86763`	`// Construct environment portion of the key:`
`86763`	`86764`	`// This consists of a hash that considers the rust version`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,10 @@ export class CacheConfig {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- // Add runner OS to the key to avoid cross-contamination of cache`
	`77`	`+ // Add runner OS and CPU architecture to the key to avoid cross-contamination of cache`
`78`	`78`	`const runnerOS = os.type();`
`79`		- key += `-${runnerOS}`;
	`79`	`+ const runnerArch = os.arch();`
	`80`	+ key += `-${runnerOS}-${runnerArch}`;
`80`	`81`
`81`	`82`	`self.keyPrefix = key;`
`82`	`83`