actions/setup-node
1
0
Fork 0
mirror of https://github.com/actions/setup-node.git synced 2025-11-04 21:39:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

win change

Browse Source
This commit is contained in:
Bryan MacFarlane
2020-05-03 15:44:03 -04:00
parent 5e5ef8fd55
commit 1b2d431484
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/proxy.yml vendored
View File

@@ -43,12 +43,12 @@ jobs:
fail-fast: false
env:
https_proxy: http://no-such-proxy:3128
no_proxy: github.com,nodejs.org,registry.npmjs.org,*.s3.amazonaws.com
no_proxy: api.github.com,github.com,nodejs.org,registry.npmjs.org,*.s3.amazonaws.com
steps:
- uses: actions/checkout@v2
- name: Clear tool cache
run: rm -rf $RUNNER_TOOL_CACHE/*
- name: Setup node 10
- name: Setup node 12
uses: ./
with:
node-version: 10.x

4
dist/index.js vendored
View File

@@ -13014,7 +13014,9 @@ function getNode(versionSpec, stable, token) {
let extPath;
if (osPlat == 'win32') {
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
// 7z extracts to filename folder
const srcPath = path.join(downloadPath, `node-v${info.resolvedVersion}-win-${osArch}`);
extPath = yield tc.extract7z(srcPath, undefined, _7zPath);
}
else {
extPath = yield tc.extractTar(downloadPath, undefined, [

7
src/installer.ts
View File

@@ -75,7 +75,12 @@ export async function getNode(
let extPath: string;
if (osPlat == 'win32') {
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
// 7z extracts to filename folder
const srcPath = path.join(
downloadPath,
`node-v${info.resolvedVersion}-win-${osArch}`
);
extPath = await tc.extract7z(srcPath, undefined, _7zPath);
} else {
extPath = await tc.extractTar(downloadPath, undefined, [
'xz',