Include CPU arch in the cache key (#228)

Swatinem · Feb 8, 2025 · 27b8ea9 · 27b8ea9
1 parent f0deed1
commit 27b8ea9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
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;