minor fix

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

10
dist/setup/index.js vendored
View File

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

View File

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

View File

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