fix: remove unused var

__tests__/cache-restore.test.ts

@@ -2,6 +2,7 @@ import * as core from '@actions/core';
 import * as cache from '@actions/cache';
 import * as path from 'path';
 import * as glob from '@actions/glob';
+import osm from 'os';
 
 import * as utils from '../src/cache-utils';
 import {restoreCache} from '../src/cache-restore';
@@ -12,6 +13,7 @@ describe('cache-restore', () => {
     process.env.RUNNER_OS = 'Linux';
   }
   const platform = process.env.RUNNER_OS;
+  const arch = 'arm64';
   const commonPath = '/some/random/path';
   const npmCachePath = `${commonPath}/npm`;
   const pnpmCachePath = `${commonPath}/pnpm`;
@@ -52,6 +54,7 @@ describe('cache-restore', () => {
   let getCommandOutputSpy: jest.SpyInstance;
   let restoreCacheSpy: jest.SpyInstance;
   let hashFilesSpy: jest.SpyInstance;
+  let archSpy: jest.SpyInstance;
 
   beforeEach(() => {
     // core
@@ -102,6 +105,10 @@ describe('cache-restore', () => {
 
     // cache-utils
     getCommandOutputSpy = jest.spyOn(utils, 'getCommandOutput');
+
+    // os
+    archSpy = jest.spyOn(osm, 'arch');
+    archSpy.mockImplementation(() => arch);
   });
 
   describe('Validate provided package manager', () => {
@@ -135,7 +142,7 @@ describe('cache-restore', () => {
         await restoreCache(packageManager, '');
         expect(hashFilesSpy).toHaveBeenCalled();
         expect(infoSpy).toHaveBeenCalledWith(
-          `Cache restored from key: node-cache-${platform}-${packageManager}-${fileHash}`
+          `Cache restored from key: node-cache-${platform}-${arch}-${packageManager}-${fileHash}`
         );
         expect(infoSpy).not.toHaveBeenCalledWith(
           `${packageManager} cache is not found`

__tests__/main.test.ts

@@ -2,7 +2,6 @@ import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import * as tc from '@actions/tool-cache';
 import * as cache from '@actions/cache';
-import * as io from '@actions/io';
 
 import fs from 'fs';
 import path from 'path';
@@ -25,10 +24,6 @@ describe('main tests', () => {
   let startGroupSpy: jest.SpyInstance;
   let endGroupSpy: jest.SpyInstance;
 
-  let whichSpy: jest.SpyInstance;
-
-  let existsSpy: jest.SpyInstance;
-
   let getExecOutputSpy: jest.SpyInstance;
 
   let getNodeVersionFromFileSpy: jest.SpyInstance;
@@ -60,8 +55,6 @@ describe('main tests', () => {
     inSpy = jest.spyOn(core, 'getInput');
     inSpy.mockImplementation(name => inputs[name]);
 
-    whichSpy = jest.spyOn(io, 'which');
-
     getExecOutputSpy = jest.spyOn(exec, 'getExecOutput');
 
     findSpy = jest.spyOn(tc, 'find');
@@ -147,10 +140,6 @@ describe('main tests', () => {
         return {stdout: obj[command], stderr: '', exitCode: 0};
       });
 
-      whichSpy.mockImplementation(cmd => {
-        return `some/${cmd}/path`;
-      });
-
       await util.printEnvDetailsAndSetOutput();
 
       expect(setOutputSpy).toHaveBeenCalledWith('node-version', obj['node']);

__tests__/official-installer.test.ts

@@ -248,9 +248,6 @@ describe('setup-node', () => {
     const toolPath = path.normalize('/cache/node/12.16.2/x64');
     exSpy.mockImplementation(async () => '/some/other/temp/path');
     cacheSpy.mockImplementation(async () => toolPath);
-    whichSpy.mockImplementation(cmd => {
-      return `some/${cmd}/path`;
-    });
 
     await main.run();
 

dist/cache-save/index.js

@@ -83336,7 +83336,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.unique = exports.printEnvDetailsAndSetOutput = exports.getNodeVersionFromFile = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const exec = __importStar(__nccwpck_require__(1514));
-const io = __importStar(__nccwpck_require__(7436));
 const fs_1 = __importDefault(__nccwpck_require__(7147));
 const path_1 = __importDefault(__nccwpck_require__(1017));
 function getNodeVersionFromFile(versionFilePath) {
@@ -83388,8 +83387,7 @@ function printEnvDetailsAndSetOutput() {
     return __awaiter(this, void 0, void 0, function* () {
         core.startGroup('Environment details');
         const promises = ['node', 'npm', 'yarn'].map((tool) => __awaiter(this, void 0, void 0, function* () {
-            const pathTool = yield io.which(tool, false);
+            const output = yield getToolVersion(tool, ['--version']);
-            const output = pathTool ? yield getToolVersion(tool, ['--version']) : '';
             return { tool, output };
         }));
         const tools = yield Promise.all(promises);

dist/setup/index.js

@@ -92559,6 +92559,7 @@ const core = __importStar(__nccwpck_require__(2186));
 const glob = __importStar(__nccwpck_require__(8090));
 const path_1 = __importDefault(__nccwpck_require__(1017));
 const fs_1 = __importDefault(__nccwpck_require__(7147));
+const os_1 = __importDefault(__nccwpck_require__(2037));
 const constants_1 = __nccwpck_require__(9042);
 const cache_utils_1 = __nccwpck_require__(1678);
 const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0, void 0, void 0, function* () {
@@ -92567,6 +92568,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0,
         throw new Error(`Caching for '${packageManager}' is not supported`);
     }
     const platform = process.env.RUNNER_OS;
+    const arch = os_1.default.arch();
     const cachePaths = yield (0, cache_utils_1.getCacheDirectories)(packageManagerInfo, cacheDependencyPath);
     core.saveState(constants_1.State.CachePaths, cachePaths);
     const lockFilePath = cacheDependencyPath
@@ -92576,7 +92578,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0,
     if (!fileHash) {
         throw new Error('Some specified paths were not resolved, unable to cache dependencies.');
     }
-    const keyPrefix = `node-cache-${platform}-${packageManager}`;
+    const keyPrefix = `node-cache-${platform}-${arch}-${packageManager}`;
     const primaryKey = `${keyPrefix}-${fileHash}`;
     core.debug(`primary key is ${primaryKey}`);
     core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
@@ -93110,11 +93112,7 @@ class BaseDistribution {
         const fileName = this.osPlat == 'win32'
             ? `node-v${version}-win-${osArch}`
             : `node-v${version}-${this.osPlat}-${osArch}`;
-        const urlFileName = this.osPlat == 'win32'
+        const urlFileName = this.osPlat == 'win32' ? `${fileName}.7z` : `${fileName}.tar.gz`;
-            ? this.nodeInfo.arch === 'arm64'
-                ? `${fileName}.zip`
-                : `${fileName}.7z`
-            : `${fileName}.tar.gz`;
         const initialUrl = this.getDistributionUrl();
         const url = `${initialUrl}/v${version}/${urlFileName}`;
         return {
@@ -93198,23 +93196,10 @@ class BaseDistribution {
             let extPath;
             info = info || {}; // satisfy compiler, never null when reaches here
             if (this.osPlat == 'win32') {
-                const extension = this.nodeInfo.arch === 'arm64' ? '.zip' : '.7z';
+                const _7zPath = path.join(__dirname, '../..', 'externals', '7zr.exe');
-                // Rename archive to add extension because after downloading
+                extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
-                // archive does not contain extension type and it leads to some issues
-                // on Windows runners without PowerShell Core.
-                //
-                // For default PowerShell Windows it should contain extension type to unpack it.
-                if (extension === '.zip') {
-                    const renamedArchive = `${downloadPath}.zip`;
-                    fs_1.default.renameSync(downloadPath, renamedArchive);
-                    extPath = yield tc.extractZip(renamedArchive);
-                }
-                else {
-                    const _7zPath = path.join(__dirname, '../..', 'externals', '7zr.exe');
-                    extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
-                }
                 // 7z extracts to folder matching file name
-                const nestedPath = path.join(extPath, path.basename(info.fileName, extension));
+                const nestedPath = path.join(extPath, path.basename(info.fileName, '.7z'));
                 if (fs_1.default.existsSync(nestedPath)) {
                     extPath = nestedPath;
                 }
@@ -93246,12 +93231,7 @@ class BaseDistribution {
                 dataFileName = `osx-${osArch}-tar`;
                 break;
             case 'win32':
-                if (this.nodeInfo.arch === 'arm64') {
+                dataFileName = `win-${osArch}-exe`;
-                    dataFileName = `win-${osArch}-zip`;
-                }
-                else {
-                    dataFileName = `win-${osArch}-exe`;
-                }
                 break;
             default:
                 throw new Error(`Unexpected OS '${this.osPlat}'`);
@@ -93805,7 +93785,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.unique = exports.printEnvDetailsAndSetOutput = exports.getNodeVersionFromFile = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const exec = __importStar(__nccwpck_require__(1514));
-const io = __importStar(__nccwpck_require__(7436));
 const fs_1 = __importDefault(__nccwpck_require__(7147));
 const path_1 = __importDefault(__nccwpck_require__(1017));
 function getNodeVersionFromFile(versionFilePath) {
@@ -93857,8 +93836,7 @@ function printEnvDetailsAndSetOutput() {
     return __awaiter(this, void 0, void 0, function* () {
         core.startGroup('Environment details');
         const promises = ['node', 'npm', 'yarn'].map((tool) => __awaiter(this, void 0, void 0, function* () {
-            const pathTool = yield io.which(tool, false);
+            const output = yield getToolVersion(tool, ['--version']);
-            const output = pathTool ? yield getToolVersion(tool, ['--version']) : '';
             return { tool, output };
         }));
         const tools = yield Promise.all(promises);

src/cache-restore.ts

@@ -3,6 +3,7 @@ import * as core from '@actions/core';
 import * as glob from '@actions/glob';
 import path from 'path';
 import fs from 'fs';
+import os from 'os';
 
 import {State} from './constants';
 import {
@@ -21,6 +22,7 @@ export const restoreCache = async (
     throw new Error(`Caching for '${packageManager}' is not supported`);
   }
   const platform = process.env.RUNNER_OS;
+  const arch = os.arch();
 
   const cachePaths = await getCacheDirectories(
     packageManagerInfo,
@@ -38,7 +40,7 @@ export const restoreCache = async (
     );
   }
 
-  const keyPrefix = `node-cache-${platform}-${packageManager}`;
+  const keyPrefix = `node-cache-${platform}-${arch}-${packageManager}`;
   const primaryKey = `${keyPrefix}-${fileHash}`;
   core.debug(`primary key is ${primaryKey}`);
 

src/distributions/base-distribution.ts

@@ -112,11 +112,7 @@ export default abstract class BaseDistribution {
         ? `node-v${version}-win-${osArch}`
         : `node-v${version}-${this.osPlat}-${osArch}`;
     const urlFileName: string =
-      this.osPlat == 'win32'
+      this.osPlat == 'win32' ? `${fileName}.7z` : `${fileName}.tar.gz`;
-        ? this.nodeInfo.arch === 'arm64'
-          ? `${fileName}.zip`
-          : `${fileName}.7z`
-        : `${fileName}.tar.gz`;
     const initialUrl = this.getDistributionUrl();
     const url = `${initialUrl}/v${version}/${urlFileName}`;
 
@@ -219,24 +215,12 @@ export default abstract class BaseDistribution {
     let extPath: string;
     info = info || ({} as INodeVersionInfo); // satisfy compiler, never null when reaches here
     if (this.osPlat == 'win32') {
-      const extension = this.nodeInfo.arch === 'arm64' ? '.zip' : '.7z';
+      const _7zPath = path.join(__dirname, '../..', 'externals', '7zr.exe');
-      // Rename archive to add extension because after downloading
+      extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
-      // archive does not contain extension type and it leads to some issues
-      // on Windows runners without PowerShell Core.
-      //
-      // For default PowerShell Windows it should contain extension type to unpack it.
-      if (extension === '.zip') {
-        const renamedArchive = `${downloadPath}.zip`;
-        fs.renameSync(downloadPath, renamedArchive);
-        extPath = await tc.extractZip(renamedArchive);
-      } else {
-        const _7zPath = path.join(__dirname, '../..', 'externals', '7zr.exe');
-        extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
-      }
       // 7z extracts to folder matching file name
       const nestedPath = path.join(
         extPath,
-        path.basename(info.fileName, extension)
+        path.basename(info.fileName, '.7z')
       );
       if (fs.existsSync(nestedPath)) {
         extPath = nestedPath;
@@ -276,11 +260,7 @@ export default abstract class BaseDistribution {
         dataFileName = `osx-${osArch}-tar`;
         break;
       case 'win32':
-        if (this.nodeInfo.arch === 'arm64') {
+        dataFileName = `win-${osArch}-exe`;
-          dataFileName = `win-${osArch}-zip`;
-        } else {
-          dataFileName = `win-${osArch}-exe`;
-        }
         break;
       default:
         throw new Error(`Unexpected OS '${this.osPlat}'`);

src/util.ts

@@ -1,6 +1,5 @@
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
-import * as io from '@actions/io';
 
 import fs from 'fs';
 import path from 'path';
@@ -62,9 +61,9 @@ export function getNodeVersionFromFile(versionFilePath: string): string | null {
 
 export async function printEnvDetailsAndSetOutput() {
   core.startGroup('Environment details');
+
   const promises = ['node', 'npm', 'yarn'].map(async tool => {
-    const pathTool = await io.which(tool, false);
+    const output = await getToolVersion(tool, ['--version']);
-    const output = pathTool ? await getToolVersion(tool, ['--version']) : '';
 
     return {tool, output};
   });