Update build
This commit is contained in:
parent
9e956a555c
commit
5a8d9111e3
|
@ -72783,8 +72783,9 @@ class OfficialBuilds extends base_distribution_1.default {
|
||||||
let toolPath = this.findVersionInHostedToolCacheDirectory();
|
let toolPath = this.findVersionInHostedToolCacheDirectory();
|
||||||
if (toolPath) {
|
if (toolPath) {
|
||||||
core.info(`Found in cache @ ${toolPath}`);
|
core.info(`Found in cache @ ${toolPath}`);
|
||||||
|
this.addToolPath(toolPath);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
let downloadPath = '';
|
let downloadPath = '';
|
||||||
try {
|
try {
|
||||||
core.info(`Attempting to download ${this.nodeInfo.versionSpec}...`);
|
core.info(`Attempting to download ${this.nodeInfo.versionSpec}...`);
|
||||||
|
@ -72813,6 +72814,22 @@ class OfficialBuilds extends base_distribution_1.default {
|
||||||
core.info('Falling back to download directly from Node');
|
core.info('Falling back to download directly from Node');
|
||||||
}
|
}
|
||||||
if (!toolPath) {
|
if (!toolPath) {
|
||||||
|
toolPath = yield this.downloadDirectlyFromNode();
|
||||||
|
}
|
||||||
|
if (this.osPlat != 'win32') {
|
||||||
|
toolPath = path_1.default.join(toolPath, 'bin');
|
||||||
|
}
|
||||||
|
core.addPath(toolPath);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
addToolPath(toolPath) {
|
||||||
|
if (this.osPlat != 'win32') {
|
||||||
|
toolPath = path_1.default.join(toolPath, 'bin');
|
||||||
|
}
|
||||||
|
core.addPath(toolPath);
|
||||||
|
}
|
||||||
|
downloadDirectlyFromNode() {
|
||||||
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
const nodeJsVersions = yield this.getNodeJsVersions();
|
const nodeJsVersions = yield this.getNodeJsVersions();
|
||||||
const versions = this.filterVersions(nodeJsVersions);
|
const versions = this.filterVersions(nodeJsVersions);
|
||||||
const evaluatedVersion = this.evaluateVersions(versions);
|
const evaluatedVersion = this.evaluateVersions(versions);
|
||||||
|
@ -72820,13 +72837,18 @@ class OfficialBuilds extends base_distribution_1.default {
|
||||||
throw new Error(`Unable to find Node version '${this.nodeInfo.versionSpec}' for platform ${this.osPlat} and architecture ${this.nodeInfo.arch}.`);
|
throw new Error(`Unable to find Node version '${this.nodeInfo.versionSpec}' for platform ${this.osPlat} and architecture ${this.nodeInfo.arch}.`);
|
||||||
}
|
}
|
||||||
const toolName = this.getNodejsDistInfo(evaluatedVersion);
|
const toolName = this.getNodejsDistInfo(evaluatedVersion);
|
||||||
toolPath = yield this.downloadNodejs(toolName);
|
try {
|
||||||
|
const toolPath = yield this.downloadNodejs(toolName);
|
||||||
|
return toolPath;
|
||||||
}
|
}
|
||||||
|
catch (error) {
|
||||||
|
if (error instanceof tc.HTTPError && error.httpStatusCode === 404) {
|
||||||
|
core.info(`Node version ${this.nodeInfo.versionSpec} for platform ${this.osPlat} and architecture ${this.nodeInfo.arch} was found but failed to download. ` +
|
||||||
|
'This usually happens when downloadable binaries are not fully updated at https://nodejs.org/. ' +
|
||||||
|
'To resolve this issue you may either fall back to the older version or try again later.');
|
||||||
}
|
}
|
||||||
if (this.osPlat != 'win32') {
|
throw error;
|
||||||
toolPath = path_1.default.join(toolPath, 'bin');
|
|
||||||
}
|
}
|
||||||
core.addPath(toolPath);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
evaluateVersions(versions) {
|
evaluateVersions(versions) {
|
||||||
|
|
Loading…
Reference in New Issue