mirror of
https://github.com/actions/setup-node
synced 2024-12-23 05:34:56 +00:00
win change
This commit is contained in:
parent
1b2d431484
commit
c8617ac6ae
2 changed files with 7 additions and 9 deletions
6
dist/index.js
vendored
6
dist/index.js
vendored
|
@ -13014,9 +13014,9 @@ function getNode(versionSpec, stable, token) {
|
|||
let extPath;
|
||||
if (osPlat == 'win32') {
|
||||
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
|
||||
// 7z extracts to filename folder
|
||||
const srcPath = path.join(downloadPath, `node-v${info.resolvedVersion}-win-${osArch}`);
|
||||
extPath = yield tc.extract7z(srcPath, undefined, _7zPath);
|
||||
extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
|
||||
// 7z extracts to folder matching file name
|
||||
extPath = path.join(extPath, path.basename(downloadPath));
|
||||
}
|
||||
else {
|
||||
extPath = yield tc.extractTar(downloadPath, undefined, [
|
||||
|
|
|
@ -75,12 +75,10 @@ export async function getNode(
|
|||
let extPath: string;
|
||||
if (osPlat == 'win32') {
|
||||
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
|
||||
// 7z extracts to filename folder
|
||||
const srcPath = path.join(
|
||||
downloadPath,
|
||||
`node-v${info.resolvedVersion}-win-${osArch}`
|
||||
);
|
||||
extPath = await tc.extract7z(srcPath, undefined, _7zPath);
|
||||
|
||||
extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
|
||||
// 7z extracts to folder matching file name
|
||||
extPath = path.join(extPath, path.basename(downloadPath));
|
||||
} else {
|
||||
extPath = await tc.extractTar(downloadPath, undefined, [
|
||||
'xz',
|
||||
|
|
Loading…
Reference in a new issue