Merge pull request #8 from irgaly/arm64

Support M1 Mac Runner / Arm64
irgaly · Nov 19, 2023 · 50e58e7 · 50e58e7
2 parents 5af319a + c9b986f
commit 50e58e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -64159,7 +64159,7 @@ async function main() {
                 core.info(`mintVersion from Mintfile: ${mintVersion}`);
             }
         }
-        const mintCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-${mintVersion}`;
+        const mintCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-${mintVersion}`;
         const mintPaths = ['/usr/local/bin/mint'];
         core.info(`mint cache key: ${mintCacheKey}`);
         const mintRestored = ((await cache.restoreCache(mintPaths, mintCacheKey)) != undefined);
@@ -64190,11 +64190,11 @@ async function main() {
             const mintBinaryNeedsCache = !pathContains(mintDirectory, mintBinaryDirectory);
             const mintPackagesDirectory = `${mintDirectory}/packages`;
             const mintDependencyPaths = [mintDirectory];
-            const mintDependencyCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-deps-${await (0, glob_1.hashFiles)(mintFile)}`;
-            const mintDependencyRestoreKeys = [`${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-deps-`];
+            const mintDependencyCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-deps-${await (0, glob_1.hashFiles)(mintFile)}`;
+            const mintDependencyRestoreKeys = [`${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-deps-`];
             const mintBinaryPaths = [mintBinaryDirectory];
-            const mintBinaryCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-bin-${await (0, glob_1.hashFiles)(mintFile)}`;
-            const mintBinaryRestoreKeys = [`${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-bin-`];
+            const mintBinaryCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-bin-${await (0, glob_1.hashFiles)(mintFile)}`;
+            const mintBinaryRestoreKeys = [`${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-bin-`];
             core.info(`mint dependency cache key: ${mintDependencyCacheKey}`);
             core.info(`mint binary cache key: ${mintBinaryCacheKey}`);
             let mintDependencyRestored = false;

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -57,7 +57,7 @@ async function main() {
         core.info(`mintVersion from Mintfile: ${mintVersion}`)
       }
     }
-    const mintCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-${mintVersion}`
+    const mintCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-${mintVersion}`
     const mintPaths = ['/usr/local/bin/mint']
     core.info(`mint cache key: ${mintCacheKey}`)
     const mintRestored = ((await cache.restoreCache(mintPaths, mintCacheKey)) != undefined)
@@ -87,11 +87,11 @@ async function main() {
       const mintBinaryNeedsCache = !pathContains(mintDirectory, mintBinaryDirectory)
       const mintPackagesDirectory = `${mintDirectory}/packages`
       const mintDependencyPaths = [mintDirectory]
-      const mintDependencyCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-deps-${await hashFiles(mintFile)}`
-      const mintDependencyRestoreKeys = [`${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-deps-`]
+      const mintDependencyCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-deps-${await hashFiles(mintFile)}`
+      const mintDependencyRestoreKeys = [`${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-deps-`]
       const mintBinaryPaths = [mintBinaryDirectory]
-      const mintBinaryCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-bin-${await hashFiles(mintFile)}`
-      const mintBinaryRestoreKeys = [`${cachePrefix}-${process.env['RUNNER_OS']}-irgaly/setup-mint-bin-`]
+      const mintBinaryCacheKey = `${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-bin-${await hashFiles(mintFile)}`
+      const mintBinaryRestoreKeys = [`${cachePrefix}-${process.env['RUNNER_OS']}-${process.env['RUNNER_ARCH']}-irgaly/setup-mint-bin-`]
       core.info(`mint dependency cache key: ${mintDependencyCacheKey}`)
       core.info(`mint binary cache key: ${mintBinaryCacheKey}`)
       let mintDependencyRestored = false