Skip to content

download from node-versions and fallback to node dist #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
May 19, 2020
Merged

download from node-versions and fallback to node dist #147

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ecf0ce6
wip
bryanmacfarlane Apr 24, 2020
8885b71
updated tests
bryanmacfarlane May 2, 2020
889def3
update ts-jest
bryanmacfarlane May 2, 2020
ec6092f
dbg
bryanmacfarlane May 2, 2020
1c2f59f
format
bryanmacfarlane May 2, 2020
22c0aea
cya snapshot
bryanmacfarlane May 2, 2020
8a1d983
format
bryanmacfarlane May 2, 2020
efab84a
dist
bryanmacfarlane May 2, 2020
ed3a918
Merge pull request #153 from actions/start-v2
bryanmacfarlane May 2, 2020
2bdb2ab
strip 1 on fallback extract
bryanmacfarlane May 2, 2020
501fd29
Merge branch 'master' into node-versions
bryanmacfarlane May 2, 2020
e3ad114
dist
bryanmacfarlane May 2, 2020
2fb08c4
update workflows
bryanmacfarlane May 3, 2020
5e5ef8f
update
bryanmacfarlane May 3, 2020
1b2d431
win change
bryanmacfarlane May 3, 2020
c8617ac
win change
bryanmacfarlane May 3, 2020
42746a4
dbg
bryanmacfarlane May 3, 2020
a414557
dbg
bryanmacfarlane May 3, 2020
f7c5caf
dbg
bryanmacfarlane May 3, 2020
dd6f5ab
only node binary issue
bryanmacfarlane May 3, 2020
11f9205
no proxy issue
bryanmacfarlane May 3, 2020
beb2155
testing 7z alt
bryanmacfarlane May 3, 2020
9fcef3f
testing 7z alt
bryanmacfarlane May 3, 2020
6a1b66a
dbg
bryanmacfarlane May 3, 2020
8e22109
dbg
bryanmacfarlane May 3, 2020
5e7b076
dbg
bryanmacfarlane May 3, 2020
a80a170
no proxy fix
bryanmacfarlane May 3, 2020
a875da2
output info
bryanmacfarlane May 3, 2020
0a9e8b1
output info
bryanmacfarlane May 3, 2020
2a0fbec
output info
bryanmacfarlane May 3, 2020
2ae9264
back to master
bryanmacfarlane May 4, 2020
e73ffbc
support ghes (#157)
ericsciple May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
only node binary issue
  • Loading branch information
@bryanmacfarlane
bryanmacfarlane committed May 3, 2020
commit dd6f5ab66cf48404b904f678af44939c411f0c85
12 changes: 6 additions & 6 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12975,7 +12975,6 @@ const io = __importStar(__webpack_require__(1));
const tc = __importStar(__webpack_require__(533));
const path = __importStar(__webpack_require__(622));
const semver = __importStar(__webpack_require__(280));
const fs = __webpack_require__(747);
function getNode(versionSpec, stable, token) {
return __awaiter(this, void 0, void 0, function* () {
let osPlat = os.platform();
Expand Down Expand Up @@ -13005,7 +13004,8 @@ function getNode(versionSpec, stable, token) {
}
catch (err) {
if (err instanceof tc.HTTPError && err.httpStatusCode == 404) {
return yield acquireNodeFromFallbackLocation(info.resolvedVersion);
yield acquireNodeFromFallbackLocation(info.resolvedVersion);
return;
}
throw err;
}
Expand All @@ -13015,12 +13015,9 @@ function getNode(versionSpec, stable, token) {
let extPath;
if (osPlat == 'win32') {
let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
console.log(`downloadPath: ${downloadPath}`, `isFile: ${fs.statSync(downloadPath).isFile()}`);
console.log(JSON.stringify(fs.statSync(downloadPath)));
extPath = yield tc.extract7z(downloadPath, undefined, _7zPath);
// 7z extracts to folder matching file name
extPath = path.join(extPath, path.basename(info.fileName, '.7z'));
console.log(`extPath: ${extPath}`, `isDirectory: ${fs.statSync(extPath).isDirectory()}`);
}
else {
extPath = yield tc.extractTar(downloadPath, undefined, [
Expand Down Expand Up @@ -13187,6 +13184,7 @@ function acquireNodeFromFallbackLocation(version) {
try {
exeUrl = `https://nodejs.org/dist/v${version}/win-${osArch}/node.exe`;
libUrl = `https://nodejs.org/dist/v${version}/win-${osArch}/node.lib`;
console.log(`Downloading only node binary from ${exeUrl}`);
const exePath = yield tc.downloadTool(exeUrl);
yield io.cp(exePath, path.join(tempDir, 'node.exe'));
const libPath = yield tc.downloadTool(libUrl);
Expand All @@ -13205,7 +13203,9 @@ function acquireNodeFromFallbackLocation(version) {
throw err;
}
}
return yield tc.cacheDir(tempDir, 'node', version);
let toolPath = yield tc.cacheDir(tempDir, 'node', version);
core.addPath(toolPath);
return toolPath;
});
}
// os.arch does not always match the relative download url, e.g.
Expand Down
9 changes: 7 additions & 2 deletions src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ export async function getNode(
downloadPath = await tc.downloadTool(info.downloadUrl, undefined, token);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldnt this use info.token?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when downloading from nodejs.org, shouldnt use a token

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or would it better to check the hostname of the download url to determine whether to pass token?

} catch (err) {
if (err instanceof tc.HTTPError && err.httpStatusCode == 404) {
return await acquireNodeFromFallbackLocation(info.resolvedVersion);
await acquireNodeFromFallbackLocation(info.resolvedVersion);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a few really old versions like 0.12.8 will have a different layout without a targz or 7z. it will have just a node binary

return;
}

throw err;
Expand Down Expand Up @@ -269,6 +270,8 @@ async function acquireNodeFromFallbackLocation(
exeUrl = `https://nodejs.org/dist/v${version}/win-${osArch}/node.exe`;
libUrl = `https://nodejs.org/dist/v${version}/win-${osArch}/node.lib`;

console.log(`Downloading only node binary from ${exeUrl}`);

const exePath = await tc.downloadTool(exeUrl);
await io.cp(exePath, path.join(tempDir, 'node.exe'));
const libPath = await tc.downloadTool(libUrl);
Expand All @@ -286,7 +289,9 @@ async function acquireNodeFromFallbackLocation(
throw err;
}
}
return await tc.cacheDir(tempDir, 'node', version);
let toolPath = await tc.cacheDir(tempDir, 'node', version);
core.addPath(toolPath);
return toolPath;
}

// os.arch does not always match the relative download url, e.g.
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy