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

minor fix

Browse source
This commit is contained in:
Dmitry Shibanov 2022-12-13 11:25:04 +01:00
parent 2d741fbf57
commit 292688b127
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dist/setup/index.js vendored
View file

@ -73234,6 +73234,9 @@ class BaseDistribution {
const toolName = this.getNodejsDistInfo(evaluatedVersion, this.osPlat); const toolName = this.getNodejsDistInfo(evaluatedVersion, this.osPlat);
toolPath = yield this.downloadNodejs(toolName); toolPath = yield this.downloadNodejs(toolName);
} }
if (this.osPlat != 'win32') {
toolPath = path.join(toolPath, 'bin');
}
core.addPath(toolPath); core.addPath(toolPath);
}); });
} }
@ -73271,9 +73274,6 @@ class BaseDistribution {
} }
let toolPath = yield this.extractArchive(downloadPath, info); let toolPath = yield this.extractArchive(downloadPath, info);
core.info('Done'); core.info('Done');
if (osPlat != 'win32') {
toolPath = path.join(toolPath, 'bin');
}
return toolPath; return toolPath;
}); });
} }
@ -73565,6 +73565,7 @@ const core = __importStar(__nccwpck_require__(2186));
const tc = __importStar(__nccwpck_require__(7784)); const tc = __importStar(__nccwpck_require__(7784));
const semver = __importStar(__nccwpck_require__(5911)); const semver = __importStar(__nccwpck_require__(5911));
const os_1 = __importDefault(__nccwpck_require__(2037)); const os_1 = __importDefault(__nccwpck_require__(2037));
const path_1 = __importDefault(__nccwpck_require__(1017));
const base_distribution_1 = __importDefault(__nccwpck_require__(8653)); const base_distribution_1 = __importDefault(__nccwpck_require__(8653));
class OfficialBuilds extends base_distribution_1.default { class OfficialBuilds extends base_distribution_1.default {
constructor(nodeInfo) { constructor(nodeInfo) {
@ -73649,6 +73650,9 @@ class OfficialBuilds extends base_distribution_1.default {
const toolName = this.getNodejsDistInfo(evaluatedVersion, this.osPlat); const toolName = this.getNodejsDistInfo(evaluatedVersion, this.osPlat);
toolPath = yield this.downloadNodejs(toolName); toolPath = yield this.downloadNodejs(toolName);
} }
if (this.osPlat != 'win32') {
toolPath = path_1.default.join(toolPath, 'bin');
}
core.addPath(toolPath); core.addPath(toolPath);
}); });
} }

8
src/distibutions/base-distribution.ts
View file

@ -36,6 +36,10 @@ export default abstract class BaseDistribution {
toolPath = await this.downloadNodejs(toolName); toolPath = await this.downloadNodejs(toolName);
} }
if (this.osPlat != 'win32') {
toolPath = path.join(toolPath, 'bin');
}
core.addPath(toolPath); core.addPath(toolPath);
} }
@ -82,10 +86,6 @@ export default abstract class BaseDistribution {
let toolPath = await this.extractArchive(downloadPath, info); let toolPath = await this.extractArchive(downloadPath, info);
core.info('Done'); core.info('Done');
if (osPlat != 'win32') {
toolPath = path.join(toolPath, 'bin');
}
return toolPath; return toolPath;
} }

5
src/distibutions/official_builds/official_builds.ts
View file

@ -2,6 +2,7 @@ import * as core from '@actions/core';
import * as tc from '@actions/tool-cache'; import * as tc from '@actions/tool-cache';
import * as semver from 'semver'; import * as semver from 'semver';
import os from 'os'; import os from 'os';
import path from 'path';
import {INodeVersion} from '../../installer'; import {INodeVersion} from '../../installer';
import BaseDistribution from '../base-distribution'; import BaseDistribution from '../base-distribution';
@ -131,6 +132,10 @@ export default class OfficialBuilds extends BaseDistribution {
toolPath = await this.downloadNodejs(toolName); toolPath = await this.downloadNodejs(toolName);
} }
if (this.osPlat != 'win32') {
toolPath = path.join(toolPath, 'bin');
}
core.addPath(toolPath); core.addPath(toolPath);
} }