actions/setup-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/actions/setup-node into auth

Browse Source
This commit is contained in:
Danny McCormick 2019-08-05 22:24:44 -04:00
commit 1be350f27e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/installer.js
View File

@ -205,18 +205,18 @@ function acquireNodeFromFallbackLocation(version) {
exeUrl = `https://nodejs.org/dist/v${version}/win-${os.arch()}/node.exe`;
libUrl = `https://nodejs.org/dist/v${version}/win-${os.arch()}/node.lib`;
const exePath = yield tc.downloadTool(exeUrl);
yield io.mv(exePath, path.join(tempDir, 'node.exe'));
yield io.cp(exePath, path.join(tempDir, 'node.exe'));
const libPath = yield tc.downloadTool(libUrl);
yield io.mv(libPath, path.join(tempDir, 'node.lib'));
yield io.cp(libPath, path.join(tempDir, 'node.lib'));
}
catch (err) {
if (err instanceof tc.HTTPError && err.httpStatusCode == 404) {
exeUrl = `https://nodejs.org/dist/v${version}/node.exe`;
libUrl = `https://nodejs.org/dist/v${version}/node.lib`;
const exePath = yield tc.downloadTool(exeUrl);
yield io.mv(exePath, path.join(tempDir, 'node.exe'));
yield io.cp(exePath, path.join(tempDir, 'node.exe'));
const libPath = yield tc.downloadTool(libUrl);
yield io.mv(libPath, path.join(tempDir, 'node.lib'));
yield io.cp(libPath, path.join(tempDir, 'node.lib'));
}
else {
throw err;

8
src/installer.ts
View File

@ -214,18 +214,18 @@ async function acquireNodeFromFallbackLocation(
libUrl = `https://nodejs.org/dist/v${version}/win-${os.arch()}/node.lib`;
const exePath = await tc.downloadTool(exeUrl);
await io.mv(exePath, path.join(tempDir, 'node.exe'));
await io.cp(exePath, path.join(tempDir, 'node.exe'));
const libPath = await tc.downloadTool(libUrl);
await io.mv(libPath, path.join(tempDir, 'node.lib'));
await io.cp(libPath, path.join(tempDir, 'node.lib'));
} catch (err) {
if (err instanceof tc.HTTPError && err.httpStatusCode == 404) {
exeUrl = `https://nodejs.org/dist/v${version}/node.exe`;
libUrl = `https://nodejs.org/dist/v${version}/node.lib`;
const exePath = await tc.downloadTool(exeUrl);
await io.mv(exePath, path.join(tempDir, 'node.exe'));
await io.cp(exePath, path.join(tempDir, 'node.exe'));
const libPath = await tc.downloadTool(libUrl);
await io.mv(libPath, path.join(tempDir, 'node.lib'));
await io.cp(libPath, path.join(tempDir, 'node.lib'));
} else {
throw err;
}