NotificationsYou must be signed in to change notification settings
Fork1.6k
Star4.6k

Commit1c7b2db

authored

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

1 parent26961cf commit1c7b2dbCopy full SHA for 1c7b2db

File tree

4 files changed

+17

-12

lines changed

dist/setup
- index.js
package-lock.json
src/distributions
- base-distribution.ts
- official_builds
  - official_builds.ts

4 files changed

+17

-12

lines changed

`‎dist/setup/index.js‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -93883,7 +93883,7 @@ class BaseDistribution {`
`93883`	`93883`	`}`
`93884`	`93884`	`throw err;`
`93885`	`93885`	`}`
`93886`		`- const toolPath = yield this.extractArchive(downloadPath, info);`
	`93886`	`+ const toolPath = yield this.extractArchive(downloadPath, info, true);`
`93887`	`93887`	`core.info('Done');`
`93888`	`93888`	`return toolPath;`
`93889`	`93889`	`});`
`@@ -93933,7 +93933,7 @@ class BaseDistribution {`
`93933`	`93933`	`return toolPath;`
`93934`	`93934`	`});`
`93935`	`93935`	`}`
`93936`		`- extractArchive(downloadPath, info) {`
	`93936`	`+ extractArchive(downloadPath, info, isOfficialArchive) {`
`93937`	`93937`	`return __awaiter(this, void 0, void 0, function* () {`
`93938`	`93938`	`//`
`93939`	`93939`	`// Extract`
`@@ -93948,7 +93948,7 @@ class BaseDistribution {`
`93948`	`93948`	`// on Windows runners without PowerShell Core.`
`93949`	`93949`	`//`
`93950`	`93950`	`// For default PowerShell Windows it should contain extension type to unpack it.`
`93951`		`- if (extension === '.zip') {`
	`93951`	`+ if (extension === '.zip' && isOfficialArchive) {`
`93952`	`93952`	const renamedArchive = `${downloadPath}.zip`;
`93953`	`93953`	`fs_1.default.renameSync(downloadPath, renamedArchive);`
`93954`	`93954`	`extPath = yield tc.extractZip(renamedArchive);`
`@@ -94186,7 +94186,7 @@ class OfficialBuilds extends base_distribution_1.default {`
`94186`	`94186`	core.info(`Acquiring ${versionInfo.resolvedVersion} - ${versionInfo.arch} from ${versionInfo.downloadUrl}`);
`94187`	`94187`	`downloadPath = yield tc.downloadTool(versionInfo.downloadUrl, undefined, this.nodeInfo.auth);`
`94188`	`94188`	`if (downloadPath) {`
`94189`		`- toolPath = yield this.extractArchive(downloadPath, versionInfo);`
	`94189`	`+ toolPath = yield this.extractArchive(downloadPath, versionInfo, false);`
`94190`	`94190`	`}`
`94191`	`94191`	`}`
`94192`	`94192`	`else {`

`‎package-lock.json‎`

Lines changed: 4 additions & 4 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

`‎src/distributions/base-distribution.ts‎`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ export default abstract class BaseDistribution {`
`150`	`150`	`throwerr;`
`151`	`151`	`}`
`152`	`152`
`153`		`-consttoolPath=awaitthis.extractArchive(downloadPath,info);`
	`153`	`+consttoolPath=awaitthis.extractArchive(downloadPath,info,true);`
`154`	`154`	`core.info('Done');`
`155`	`155`
`156`	`156`	`returntoolPath;`
`@@ -210,7 +210,8 @@ export default abstract class BaseDistribution {`
`210`	`210`
`211`	`211`	`protectedasyncextractArchive(`
`212`	`212`	`downloadPath:string,`
`213`		`-info:INodeVersionInfo\|null`
	`213`	`+info:INodeVersionInfo\|null,`
	`214`	`+isOfficialArchive?:boolean`
`214`	`215`	`){`
`215`	`216`	`//`
`216`	`217`	`// Extract`
`@@ -225,7 +226,7 @@ export default abstract class BaseDistribution {`
`225`	`226`	`// on Windows runners without PowerShell Core.`
`226`	`227`	`//`
`227`	`228`	`// For default PowerShell Windows it should contain extension type to unpack it.`
`228`		`-if(extension==='.zip'){`
	`229`	`+if(extension==='.zip'&&isOfficialArchive){`
`229`	`230`	constrenamedArchive=`${downloadPath}.zip`;
`230`	`231`	`fs.renameSync(downloadPath,renamedArchive);`
`231`	`232`	`extPath=awaittc.extractZip(renamedArchive);`

`‎src/distributions/official_builds/official_builds.ts‎`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,11 @@ export default class OfficialBuilds extends BaseDistribution {`
`88`	`88`	`);`
`89`	`89`
`90`	`90`	`if(downloadPath){`
`91`		`-toolPath=awaitthis.extractArchive(downloadPath,versionInfo);`
	`91`	`+toolPath=awaitthis.extractArchive(`
	`92`	`+downloadPath,`
	`93`	`+versionInfo,`
	`94`	`+false`
	`95`	`+);`
`92`	`96`	`}`
`93`	`97`	`}else{`
`94`	`98`	`core.info(`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1c7b2db

File tree

4 files changed

4 files changed

`‎dist/setup/index.js‎`

`‎package-lock.json‎`

`‎src/distributions/base-distribution.ts‎`

`‎src/distributions/official_builds/official_builds.ts‎`

0 commit comments