Skip to content

Commit 1b2d431

Browse files
win change
1 parent 5e5ef8f commit 1b2d431

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/proxy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
fail-fast: false
4444
env:
4545
https_proxy: http://no-such-proxy:3128
46-
no_proxy: github.com,nodejs.org,registry.npmjs.org,*.s3.amazonaws.com
46+
no_proxy: api.github.com,github.com,nodejs.org,registry.npmjs.org,*.s3.amazonaws.com
4747
steps:
4848
- uses: actions/checkout@v2
4949
- name: Clear tool cache
5050
run: rm -rf $RUNNER_TOOL_CACHE/*
51-
- name: Setup node 10
51+
- name: Setup node 12
5252
uses: ./
5353
with:
5454
node-version: 10.x

dist/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13014,7 +13014,9 @@ function getNode(versionSpec, stable, token) {
1301413014
let extPath;
1301513015
if (osPlat == 'win32') {
1301613016
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
13017-
extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
13017+
// 7z extracts to filename folder
13018+
const srcPath = path.join(downloadPath, `node-v${info.resolvedVersion}-win-${osArch}`);
13019+
extPath = yield tc.extract7z(srcPath, undefined, _7zPath);
1301813020
}
1301913021
else {
1302013022
extPath = yield tc.extractTar(downloadPath, undefined, [

src/installer.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ export async function getNode(
7575
let extPath: string;
7676
if (osPlat == 'win32') {
7777
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
78-
extPath = await tc.extract7z(downloadPath, undefined, _7zPath);
78+
// 7z extracts to filename folder
79+
const srcPath = path.join(
80+
downloadPath,
81+
`node-v${info.resolvedVersion}-win-${osArch}`
82+
);
83+
extPath = await tc.extract7z(srcPath, undefined, _7zPath);
7984
} else {
8085
extPath = await tc.extractTar(downloadPath, undefined, [
8186
'xz',

0 commit comments

Comments
 (0)