Merge 574251b8c5 into 67fbd726da

dist/cleanup/index.js

@@ -88116,7 +88116,7 @@ function computeCacheKey(packageManager, cacheDependencyPath) {
         if (!fileHash) {
             throw new Error(`No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`);
         }
-        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
+        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${packageManager.id}-${fileHash}`;
     });
 }
 /**

src/cache.ts

@@ -98,7 +98,7 @@ async function computeCacheKey(
       `No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`
     );
   }
-  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
+  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${packageManager.id}-${fileHash}`;
 }
 
 /**

src/distributions/corretto/installer.ts

@@ -93,7 +93,7 @@ export class CorrettoDistribution extends JavaBase {
     const imageType = this.packageType;
 
     if (core.isDebug()) {
-      console.time('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
+      console.time('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
     }
 
     const availableVersionsUrl =
@@ -116,7 +116,7 @@ export class CorrettoDistribution extends JavaBase {
 
     if (core.isDebug()) {
       core.startGroup('Print information about available versions');
-      console.timeEnd('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
+      console.timeEnd('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
       core.debug(`Available versions: [${availableVersions.length}]`);
       core.debug(
         availableVersions