From 1c7b2db92075f828bee89d7e19d33a911d15e7b3 Mon Sep 17 00:00:00 2001 From: Priya Gupta <147705955+priyagupta108@users.noreply.github.com> Date: Sat, 7 Sep 2024 01:00:34 +0530 Subject: [PATCH] Fix: windows arm64 setup (#1126) * Add condition to ensure ZIP extraction targets only Windows ARM64 official archives * Bumps micromatch from 4.0.5 to 4.0.8 --- dist/setup/index.js | 8 ++++---- package-lock.json | 8 ++++---- src/distributions/base-distribution.ts | 7 ++++--- src/distributions/official_builds/official_builds.ts | 6 +++++- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 2e3e552a7..e1b7296f5 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -93883,7 +93883,7 @@ class BaseDistribution { } throw err; } - const toolPath = yield this.extractArchive(downloadPath, info); + const toolPath = yield this.extractArchive(downloadPath, info, true); core.info('Done'); return toolPath; }); @@ -93933,7 +93933,7 @@ class BaseDistribution { return toolPath; }); } - extractArchive(downloadPath, info) { + extractArchive(downloadPath, info, isOfficialArchive) { return __awaiter(this, void 0, void 0, function* () { // // Extract @@ -93948,7 +93948,7 @@ class BaseDistribution { // on Windows runners without PowerShell Core. // // For default PowerShell Windows it should contain extension type to unpack it. - if (extension === '.zip') { + if (extension === '.zip' && isOfficialArchive) { const renamedArchive = `${downloadPath}.zip`; fs_1.default.renameSync(downloadPath, renamedArchive); extPath = yield tc.extractZip(renamedArchive); @@ -94186,7 +94186,7 @@ class OfficialBuilds extends base_distribution_1.default { core.info(`Acquiring ${versionInfo.resolvedVersion} - ${versionInfo.arch} from ${versionInfo.downloadUrl}`); downloadPath = yield tc.downloadTool(versionInfo.downloadUrl, undefined, this.nodeInfo.auth); if (downloadPath) { - toolPath = yield this.extractArchive(downloadPath, versionInfo); + toolPath = yield this.extractArchive(downloadPath, versionInfo, false); } } else { diff --git a/package-lock.json b/package-lock.json index d4724a655..56eb064ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4429,12 +4429,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { diff --git a/src/distributions/base-distribution.ts b/src/distributions/base-distribution.ts index cf5bb5449..70b4b5724 100644 --- a/src/distributions/base-distribution.ts +++ b/src/distributions/base-distribution.ts @@ -150,7 +150,7 @@ export default abstract class BaseDistribution { throw err; } - const toolPath = await this.extractArchive(downloadPath, info); + const toolPath = await this.extractArchive(downloadPath, info, true); core.info('Done'); return toolPath; @@ -210,7 +210,8 @@ export default abstract class BaseDistribution { protected async extractArchive( downloadPath: string, - info: INodeVersionInfo | null + info: INodeVersionInfo | null, + isOfficialArchive?: boolean ) { // // Extract @@ -225,7 +226,7 @@ export default abstract class BaseDistribution { // on Windows runners without PowerShell Core. // // For default PowerShell Windows it should contain extension type to unpack it. - if (extension === '.zip') { + if (extension === '.zip' && isOfficialArchive) { const renamedArchive = `${downloadPath}.zip`; fs.renameSync(downloadPath, renamedArchive); extPath = await tc.extractZip(renamedArchive); diff --git a/src/distributions/official_builds/official_builds.ts b/src/distributions/official_builds/official_builds.ts index 4e368b001..e56eaf812 100644 --- a/src/distributions/official_builds/official_builds.ts +++ b/src/distributions/official_builds/official_builds.ts @@ -88,7 +88,11 @@ export default class OfficialBuilds extends BaseDistribution { ); if (downloadPath) { - toolPath = await this.extractArchive(downloadPath, versionInfo); + toolPath = await this.extractArchive( + downloadPath, + versionInfo, + false + ); } } else { core.info(