Merge pull request #432 from akv-platform/refactor-installer
Refactor installer
This commit is contained in:
Nikolai Laevskii
GitHub
commit
7ed547ca75
|
|
@ -297,14 +297,14 @@ describe('installer tests', () => {
|
|||
describe('addToPath() tests', () => {
|
||||
it(`should export DOTNET_ROOT env.var with value from DOTNET_INSTALL_DIR env.var`, async () => {
|
||||
process.env['DOTNET_INSTALL_DIR'] = 'fictitious/dotnet/install/dir';
|
||||
installer.DotnetCoreInstaller.addToPath();
|
||||
installer.DotnetInstallDir.addToPath();
|
||||
const dotnet_root = process.env['DOTNET_ROOT'];
|
||||
expect(dotnet_root).toBe(process.env['DOTNET_INSTALL_DIR']);
|
||||
});
|
||||
|
||||
it(`should export value from DOTNET_INSTALL_DIR env.var to the PATH`, async () => {
|
||||
process.env['DOTNET_INSTALL_DIR'] = 'fictitious/dotnet/install/dir';
|
||||
installer.DotnetCoreInstaller.addToPath();
|
||||
installer.DotnetInstallDir.addToPath();
|
||||
const path = process.env['PATH'];
|
||||
expect(path).toContain(process.env['DOTNET_INSTALL_DIR']);
|
||||
});
|
||||
|
|
@ -312,7 +312,7 @@ describe('installer tests', () => {
|
|||
});
|
||||
|
||||
describe('DotnetVersionResolver tests', () => {
|
||||
describe('createDotNetVersion() tests', () => {
|
||||
describe('createDotnetVersion() tests', () => {
|
||||
each([
|
||||
'3.1',
|
||||
'3.x',
|
||||
|
|
@ -329,7 +329,7 @@ describe('installer tests', () => {
|
|||
version
|
||||
);
|
||||
const versionObject =
|
||||
await dotnetVersionResolver.createDotNetVersion();
|
||||
await dotnetVersionResolver.createDotnetVersion();
|
||||
|
||||
expect(!!versionObject.value).toBe(true);
|
||||
}
|
||||
|
|
@ -368,7 +368,7 @@ describe('installer tests', () => {
|
|||
);
|
||||
|
||||
await expect(
|
||||
async () => await dotnetVersionResolver.createDotNetVersion()
|
||||
async () => await dotnetVersionResolver.createDotnetVersion()
|
||||
).rejects.toThrow();
|
||||
}
|
||||
);
|
||||
|
|
@ -380,7 +380,7 @@ describe('installer tests', () => {
|
|||
version
|
||||
);
|
||||
const versionObject =
|
||||
await dotnetVersionResolver.createDotNetVersion();
|
||||
await dotnetVersionResolver.createDotnetVersion();
|
||||
|
||||
expect(versionObject.type.toLowerCase().includes('channel')).toBe(
|
||||
true
|
||||
|
|
@ -395,7 +395,7 @@ describe('installer tests', () => {
|
|||
version
|
||||
);
|
||||
const versionObject =
|
||||
await dotnetVersionResolver.createDotNetVersion();
|
||||
await dotnetVersionResolver.createDotnetVersion();
|
||||
|
||||
expect(versionObject.type.toLowerCase().includes('channel')).toBe(
|
||||
true
|
||||
|
|
@ -411,7 +411,7 @@ describe('installer tests', () => {
|
|||
version
|
||||
);
|
||||
const versionObject =
|
||||
await dotnetVersionResolver.createDotNetVersion();
|
||||
await dotnetVersionResolver.createDotnetVersion();
|
||||
|
||||
expect(versionObject.type.toLowerCase().includes('version')).toBe(
|
||||
true
|
||||
|
|
@ -427,7 +427,7 @@ describe('installer tests', () => {
|
|||
version
|
||||
);
|
||||
const versionObject =
|
||||
await dotnetVersionResolver.createDotNetVersion();
|
||||
await dotnetVersionResolver.createDotnetVersion();
|
||||
const windowsRegEx = new RegExp(/^-(Version|Channel)/);
|
||||
const nonWindowsRegEx = new RegExp(/^--(version|channel)/);
|
||||
|
||||
|
|
@ -447,7 +447,7 @@ describe('installer tests', () => {
|
|||
version
|
||||
);
|
||||
await expect(
|
||||
async () => await dotnetVersionResolver.createDotNetVersion()
|
||||
async () => await dotnetVersionResolver.createDotnetVersion()
|
||||
).rejects.toThrow(
|
||||
`'dotnet-version' was supplied in invalid format: ${version}! The A.B.Cxx syntax is available since the .NET 5.0 release.`
|
||||
);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import semver from 'semver';
|
|||
import * as auth from '../src/authutil';
|
||||
|
||||
import * as setup from '../src/setup-dotnet';
|
||||
import {DotnetCoreInstaller} from '../src/installer';
|
||||
import {DotnetCoreInstaller, DotnetInstallDir} from '../src/installer';
|
||||
import * as cacheUtils from '../src/cache-utils';
|
||||
import * as cacheRestore from '../src/cache-restore';
|
||||
|
||||
|
|
@ -28,22 +28,25 @@ describe('setup-dotnet tests', () => {
|
|||
DotnetCoreInstaller.prototype,
|
||||
'installDotnet'
|
||||
);
|
||||
const addToPathSpy = jest.spyOn(DotnetCoreInstaller, 'addToPath');
|
||||
|
||||
const isCacheFeatureAvailableSpy = jest.spyOn(
|
||||
cacheUtils,
|
||||
'isCacheFeatureAvailable'
|
||||
);
|
||||
const restoreCacheSpy = jest.spyOn(cacheRestore, 'restoreCache');
|
||||
const configAuthenticationSpy = jest.spyOn(auth, 'configAuthentication');
|
||||
const addToPathOriginal = DotnetInstallDir.addToPath;
|
||||
|
||||
describe('run() tests', () => {
|
||||
beforeEach(() => {
|
||||
DotnetInstallDir.addToPath = jest.fn();
|
||||
getMultilineInputSpy.mockImplementation(input => inputs[input as string]);
|
||||
getInputSpy.mockImplementation(input => inputs[input as string]);
|
||||
getBooleanInputSpy.mockImplementation(input => inputs[input as string]);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
DotnetInstallDir.addToPath = addToPathOriginal;
|
||||
jest.clearAllMocks();
|
||||
jest.resetAllMocks();
|
||||
});
|
||||
|
|
@ -104,10 +107,9 @@ describe('setup-dotnet tests', () => {
|
|||
inputs['dotnet-quality'] = '';
|
||||
|
||||
installDotnetSpy.mockImplementation(() => Promise.resolve(''));
|
||||
addToPathSpy.mockImplementation(() => {});
|
||||
|
||||
await setup.run();
|
||||
expect(addToPathSpy).toHaveBeenCalledTimes(1);
|
||||
expect(DotnetInstallDir.addToPath).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('should call auth.configAuthentication() if source-url input is provided', async () => {
|
||||
|
|
@ -148,10 +150,9 @@ describe('setup-dotnet tests', () => {
|
|||
installDotnetSpy.mockImplementation(() =>
|
||||
Promise.resolve(`${inputs['dotnet-version']}`)
|
||||
);
|
||||
addToPathSpy.mockImplementation(() => {});
|
||||
|
||||
await setup.run();
|
||||
expect(setOutputSpy).toHaveBeenCalledTimes(1);
|
||||
expect(DotnetInstallDir.addToPath).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it(`shouldn't call setOutput() if parsing dotnet-installer logs failed`, async () => {
|
||||
|
|
@ -159,7 +160,6 @@ describe('setup-dotnet tests', () => {
|
|||
const warningMessage = `Failed to output the installed version of .NET. The 'dotnet-version' output will not be set.`;
|
||||
|
||||
installDotnetSpy.mockImplementation(() => Promise.resolve(null));
|
||||
addToPathSpy.mockImplementation(() => {});
|
||||
|
||||
await setup.run();
|
||||
expect(warningSpy).toHaveBeenCalledWith(warningMessage);
|
||||
|
|
@ -170,8 +170,6 @@ describe('setup-dotnet tests', () => {
|
|||
inputs['dotnet-version'] = [];
|
||||
const warningMessage = `The 'dotnet-version' output will not be set.`;
|
||||
|
||||
addToPathSpy.mockImplementation(() => {});
|
||||
|
||||
await setup.run();
|
||||
|
||||
expect(infoSpy).toHaveBeenCalledWith(warningMessage);
|
||||
|
|
@ -185,7 +183,6 @@ describe('setup-dotnet tests', () => {
|
|||
inputs['cache-dependency-path'] = 'fictitious.package.lock.json';
|
||||
|
||||
installDotnetSpy.mockImplementation(() => Promise.resolve(''));
|
||||
addToPathSpy.mockImplementation(() => {});
|
||||
|
||||
isCacheFeatureAvailableSpy.mockImplementation(() => true);
|
||||
restoreCacheSpy.mockImplementation(() => Promise.resolve());
|
||||
|
|
@ -203,7 +200,6 @@ describe('setup-dotnet tests', () => {
|
|||
inputs['cache'] = false;
|
||||
|
||||
installDotnetSpy.mockImplementation(() => Promise.resolve(''));
|
||||
addToPathSpy.mockImplementation(() => {});
|
||||
|
||||
isCacheFeatureAvailableSpy.mockImplementation(() => true);
|
||||
restoreCacheSpy.mockImplementation(() => Promise.resolve());
|
||||
|
|
@ -218,7 +214,6 @@ describe('setup-dotnet tests', () => {
|
|||
inputs['cache'] = true;
|
||||
|
||||
installDotnetSpy.mockImplementation(() => Promise.resolve(''));
|
||||
addToPathSpy.mockImplementation(() => {});
|
||||
|
||||
isCacheFeatureAvailableSpy.mockImplementation(() => false);
|
||||
restoreCacheSpy.mockImplementation(() => Promise.resolve());
|
||||
|
|
|
|||
|
|
@ -71171,9 +71171,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|||
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||
};
|
||||
var _a;
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.DotnetCoreInstaller = exports.DotnetVersionResolver = void 0;
|
||||
exports.DotnetCoreInstaller = exports.DotnetInstallDir = exports.DotnetInstallScript = exports.DotnetVersionResolver = void 0;
|
||||
// Load tempDirectory before it gets wiped by tool-cache
|
||||
const core = __importStar(__nccwpck_require__(2186));
|
||||
const exec = __importStar(__nccwpck_require__(1514));
|
||||
|
|
@ -71208,8 +71207,8 @@ class DotnetVersionResolver {
|
|||
return /^\d+$/.test(versionTag);
|
||||
}
|
||||
isLatestPatchSyntax() {
|
||||
var _b, _c;
|
||||
const majorTag = (_c = (_b = this.inputVersion.match(/^(?<majorTag>\d+)\.\d+\.\d{1}x{2}$/)) === null || _b === void 0 ? void 0 : _b.groups) === null || _c === void 0 ? void 0 : _c.majorTag;
|
||||
var _a, _b;
|
||||
const majorTag = (_b = (_a = this.inputVersion.match(/^(?<majorTag>\d+)\.\d+\.\d{1}x{2}$/)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.majorTag;
|
||||
if (majorTag &&
|
||||
parseInt(majorTag) < LATEST_PATCH_SYNTAX_MINIMAL_MAJOR_TAG) {
|
||||
throw new Error(`The 'dotnet-version' was supplied in invalid format: ${this.inputVersion}! The A.B.Cxx syntax is available since the .NET 5.0 release.`);
|
||||
|
|
@ -71241,7 +71240,7 @@ class DotnetVersionResolver {
|
|||
parseInt(major) >= QUALITY_INPUT_MINIMAL_MAJOR_TAG ? true : false;
|
||||
});
|
||||
}
|
||||
createDotNetVersion() {
|
||||
createDotnetVersion() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
yield this.resolveVersionInput();
|
||||
if (!this.resolvedArgument.type) {
|
||||
|
|
@ -71264,7 +71263,7 @@ class DotnetVersionResolver {
|
|||
allowRetries: true,
|
||||
maxRetries: 3
|
||||
});
|
||||
const response = yield httpClient.getJson(DotnetVersionResolver.DotNetCoreIndexUrl);
|
||||
const response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl);
|
||||
const result = response.result || {};
|
||||
const releasesInfo = result['releases-index'];
|
||||
const releaseInfo = releasesInfo.find(info => {
|
||||
|
|
@ -71272,47 +71271,29 @@ class DotnetVersionResolver {
|
|||
return sdkParts[0] === majorTag;
|
||||
});
|
||||
if (!releaseInfo) {
|
||||
throw new Error(`Could not find info for version with major tag: "${majorTag}" at ${DotnetVersionResolver.DotNetCoreIndexUrl}`);
|
||||
throw new Error(`Could not find info for version with major tag: "${majorTag}" at ${DotnetVersionResolver.DotnetCoreIndexUrl}`);
|
||||
}
|
||||
return releaseInfo['channel-version'];
|
||||
});
|
||||
}
|
||||
}
|
||||
exports.DotnetVersionResolver = DotnetVersionResolver;
|
||||
DotnetVersionResolver.DotNetCoreIndexUrl = 'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
|
||||
class DotnetCoreInstaller {
|
||||
constructor(version, quality) {
|
||||
this.version = version;
|
||||
this.quality = quality;
|
||||
DotnetVersionResolver.DotnetCoreIndexUrl = 'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
|
||||
class DotnetInstallScript {
|
||||
constructor() {
|
||||
this.scriptName = utils_1.IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
|
||||
this.scriptArguments = [];
|
||||
this.escapedScript = path_1.default
|
||||
.join(__dirname, '..', '..', 'externals', this.scriptName)
|
||||
.replace(/'/g, "''");
|
||||
if (utils_1.IS_WINDOWS) {
|
||||
this.setupScriptPowershell();
|
||||
return;
|
||||
}
|
||||
static convertInstallPathToAbsolute(installDir) {
|
||||
let transformedPath;
|
||||
if (path_1.default.isAbsolute(installDir)) {
|
||||
transformedPath = installDir;
|
||||
this.setupScriptBash();
|
||||
}
|
||||
else {
|
||||
transformedPath = installDir.startsWith('~')
|
||||
? path_1.default.join(os_1.default.homedir(), installDir.slice(1))
|
||||
: (transformedPath = path_1.default.join(process.cwd(), installDir));
|
||||
}
|
||||
return path_1.default.normalize(transformedPath);
|
||||
}
|
||||
static addToPath() {
|
||||
core.addPath(process.env['DOTNET_INSTALL_DIR']);
|
||||
core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
|
||||
}
|
||||
setQuality(dotnetVersion, scriptArguments) {
|
||||
const option = utils_1.IS_WINDOWS ? '-Quality' : '--quality';
|
||||
if (dotnetVersion.qualityFlag) {
|
||||
scriptArguments.push(option, this.quality);
|
||||
}
|
||||
else {
|
||||
core.warning(`The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`);
|
||||
}
|
||||
}
|
||||
installDotnet() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const windowsDefaultOptions = [
|
||||
setupScriptPowershell() {
|
||||
this.scriptArguments = [
|
||||
'-NoLogo',
|
||||
'-Sta',
|
||||
'-NoProfile',
|
||||
|
|
@ -71321,50 +71302,93 @@ class DotnetCoreInstaller {
|
|||
'Unrestricted',
|
||||
'-Command'
|
||||
];
|
||||
const scriptName = utils_1.IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
|
||||
const escapedScript = path_1.default
|
||||
.join(__dirname, '..', '..', 'externals', scriptName)
|
||||
.replace(/'/g, "''");
|
||||
let scriptArguments;
|
||||
let scriptPath = '';
|
||||
const versionResolver = new DotnetVersionResolver(this.version);
|
||||
const dotnetVersion = yield versionResolver.createDotNetVersion();
|
||||
if (utils_1.IS_WINDOWS) {
|
||||
scriptArguments = ['&', `'${escapedScript}'`];
|
||||
if (dotnetVersion.type) {
|
||||
scriptArguments.push(dotnetVersion.type, dotnetVersion.value);
|
||||
}
|
||||
if (this.quality) {
|
||||
this.setQuality(dotnetVersion, scriptArguments);
|
||||
}
|
||||
this.scriptArguments.push('&', `'${this.escapedScript}'`);
|
||||
if (process.env['https_proxy'] != null) {
|
||||
scriptArguments.push(`-ProxyAddress ${process.env['https_proxy']}`);
|
||||
this.scriptArguments.push(`-ProxyAddress ${process.env['https_proxy']}`);
|
||||
}
|
||||
// This is not currently an option
|
||||
if (process.env['no_proxy'] != null) {
|
||||
scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
|
||||
this.scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
|
||||
}
|
||||
scriptPath =
|
||||
(yield io.which('pwsh', false)) || (yield io.which('powershell', true));
|
||||
scriptArguments = windowsDefaultOptions.concat(scriptArguments);
|
||||
}
|
||||
else {
|
||||
(0, fs_1.chmodSync)(escapedScript, '777');
|
||||
scriptPath = yield io.which(escapedScript, true);
|
||||
scriptArguments = [];
|
||||
setupScriptBash() {
|
||||
(0, fs_1.chmodSync)(this.escapedScript, '777');
|
||||
}
|
||||
getScriptPath() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
if (utils_1.IS_WINDOWS) {
|
||||
return (yield io.which('pwsh', false)) || io.which('powershell', true);
|
||||
}
|
||||
return io.which(this.escapedScript, true);
|
||||
});
|
||||
}
|
||||
useArguments(...args) {
|
||||
this.scriptArguments.push(...args);
|
||||
return this;
|
||||
}
|
||||
useVersion(dotnetVersion, quality) {
|
||||
if (dotnetVersion.type) {
|
||||
scriptArguments.push(dotnetVersion.type, dotnetVersion.value);
|
||||
this.useArguments(dotnetVersion.type, dotnetVersion.value);
|
||||
}
|
||||
if (this.quality) {
|
||||
this.setQuality(dotnetVersion, scriptArguments);
|
||||
if (quality && !dotnetVersion.qualityFlag) {
|
||||
core.warning(`The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${dotnetVersion.value}. 'dotnet-quality' input is ignored.`);
|
||||
return this;
|
||||
}
|
||||
if (quality) {
|
||||
this.useArguments(utils_1.IS_WINDOWS ? '-Quality' : '--quality', quality);
|
||||
}
|
||||
// process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
|
||||
return this;
|
||||
}
|
||||
execute() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const getExecOutputOptions = {
|
||||
ignoreReturnCode: true,
|
||||
env: process.env
|
||||
};
|
||||
const { exitCode, stdout, stderr } = yield exec.getExecOutput(`"${scriptPath}"`, scriptArguments, getExecOutputOptions);
|
||||
return exec.getExecOutput(`"${yield this.getScriptPath()}"`, this.scriptArguments, getExecOutputOptions);
|
||||
});
|
||||
}
|
||||
}
|
||||
exports.DotnetInstallScript = DotnetInstallScript;
|
||||
class DotnetInstallDir {
|
||||
static convertInstallPathToAbsolute(installDir) {
|
||||
if (path_1.default.isAbsolute(installDir))
|
||||
return path_1.default.normalize(installDir);
|
||||
const transformedPath = installDir.startsWith('~')
|
||||
? path_1.default.join(os_1.default.homedir(), installDir.slice(1))
|
||||
: path_1.default.join(process.cwd(), installDir);
|
||||
return path_1.default.normalize(transformedPath);
|
||||
}
|
||||
static addToPath() {
|
||||
core.addPath(process.env['DOTNET_INSTALL_DIR']);
|
||||
core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
|
||||
}
|
||||
static setEnvironmentVariable() {
|
||||
process.env['DOTNET_INSTALL_DIR'] = DotnetInstallDir.dirPath;
|
||||
}
|
||||
}
|
||||
exports.DotnetInstallDir = DotnetInstallDir;
|
||||
DotnetInstallDir.default = {
|
||||
linux: '/usr/share/dotnet',
|
||||
mac: path_1.default.join(process.env['HOME'] + '', '.dotnet'),
|
||||
windows: path_1.default.join(process.env['PROGRAMFILES'] + '', 'dotnet')
|
||||
};
|
||||
DotnetInstallDir.dirPath = process.env['DOTNET_INSTALL_DIR']
|
||||
? DotnetInstallDir.convertInstallPathToAbsolute(process.env['DOTNET_INSTALL_DIR'])
|
||||
: DotnetInstallDir.default[utils_1.PLATFORM];
|
||||
class DotnetCoreInstaller {
|
||||
constructor(version, quality) {
|
||||
this.version = version;
|
||||
this.quality = quality;
|
||||
}
|
||||
installDotnet() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const versionResolver = new DotnetVersionResolver(this.version);
|
||||
const dotnetVersion = yield versionResolver.createDotnetVersion();
|
||||
const installScript = new DotnetInstallScript()
|
||||
.useArguments(utils_1.IS_WINDOWS ? '-SkipNonVersionedFiles' : '--skip-non-versioned-files')
|
||||
.useVersion(dotnetVersion, this.quality);
|
||||
const { exitCode, stderr, stdout } = yield installScript.execute();
|
||||
if (exitCode) {
|
||||
throw new Error(`Failed to install dotnet, exit code: ${exitCode}. ${stderr}`);
|
||||
}
|
||||
|
|
@ -71382,26 +71406,8 @@ class DotnetCoreInstaller {
|
|||
}
|
||||
}
|
||||
exports.DotnetCoreInstaller = DotnetCoreInstaller;
|
||||
_a = DotnetCoreInstaller;
|
||||
(() => {
|
||||
const installationDirectoryWindows = path_1.default.join(process.env['PROGRAMFILES'] + '', 'dotnet');
|
||||
const installationDirectoryLinux = '/usr/share/dotnet';
|
||||
const installationDirectoryMac = path_1.default.join(process.env['HOME'] + '', '.dotnet');
|
||||
const dotnetInstallDir = process.env['DOTNET_INSTALL_DIR'];
|
||||
if (dotnetInstallDir) {
|
||||
process.env['DOTNET_INSTALL_DIR'] =
|
||||
_a.convertInstallPathToAbsolute(dotnetInstallDir);
|
||||
}
|
||||
else {
|
||||
if (utils_1.IS_WINDOWS) {
|
||||
process.env['DOTNET_INSTALL_DIR'] = installationDirectoryWindows;
|
||||
}
|
||||
else {
|
||||
process.env['DOTNET_INSTALL_DIR'] = utils_1.IS_LINUX
|
||||
? installationDirectoryLinux
|
||||
: installationDirectoryMac;
|
||||
}
|
||||
}
|
||||
DotnetInstallDir.setEnvironmentVariable();
|
||||
})();
|
||||
|
||||
|
||||
|
|
@ -71510,7 +71516,7 @@ function run() {
|
|||
const installedVersion = yield dotnetInstaller.installDotnet();
|
||||
installedDotnetVersions.push(installedVersion);
|
||||
}
|
||||
installer_1.DotnetCoreInstaller.addToPath();
|
||||
installer_1.DotnetInstallDir.addToPath();
|
||||
}
|
||||
const sourceUrl = core.getInput('source-url');
|
||||
const configFile = core.getInput('config-file');
|
||||
|
|
@ -71576,9 +71582,15 @@ run();
|
|||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||
exports.IS_LINUX = exports.IS_WINDOWS = void 0;
|
||||
exports.PLATFORM = exports.IS_WINDOWS = void 0;
|
||||
exports.IS_WINDOWS = process.platform === 'win32';
|
||||
exports.IS_LINUX = process.platform === 'linux';
|
||||
exports.PLATFORM = (() => {
|
||||
if (process.platform === 'win32')
|
||||
return 'windows';
|
||||
if (process.platform === 'linux')
|
||||
return 'linux';
|
||||
return 'mac';
|
||||
})();
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
|
|
|||
215
src/installer.ts
215
src/installer.ts
|
|
@ -7,7 +7,7 @@ import {chmodSync} from 'fs';
|
|||
import path from 'path';
|
||||
import os from 'os';
|
||||
import semver from 'semver';
|
||||
import {IS_LINUX, IS_WINDOWS} from './utils';
|
||||
import {IS_WINDOWS, PLATFORM} from './utils';
|
||||
import {QualityOptions} from './setup-dotnet';
|
||||
|
||||
export interface DotnetVersion {
|
||||
|
|
@ -81,7 +81,7 @@ export class DotnetVersionResolver {
|
|||
parseInt(major) >= QUALITY_INPUT_MINIMAL_MAJOR_TAG ? true : false;
|
||||
}
|
||||
|
||||
public async createDotNetVersion(): Promise<DotnetVersion> {
|
||||
public async createDotnetVersion(): Promise<DotnetVersion> {
|
||||
await this.resolveVersionInput();
|
||||
if (!this.resolvedArgument.type) {
|
||||
return this.resolvedArgument;
|
||||
|
|
@ -102,7 +102,7 @@ export class DotnetVersionResolver {
|
|||
maxRetries: 3
|
||||
});
|
||||
const response = await httpClient.getJson<any>(
|
||||
DotnetVersionResolver.DotNetCoreIndexUrl
|
||||
DotnetVersionResolver.DotnetCoreIndexUrl
|
||||
);
|
||||
const result = response.result || {};
|
||||
const releasesInfo: any[] = result['releases-index'];
|
||||
|
|
@ -114,85 +114,37 @@ export class DotnetVersionResolver {
|
|||
|
||||
if (!releaseInfo) {
|
||||
throw new Error(
|
||||
`Could not find info for version with major tag: "${majorTag}" at ${DotnetVersionResolver.DotNetCoreIndexUrl}`
|
||||
`Could not find info for version with major tag: "${majorTag}" at ${DotnetVersionResolver.DotnetCoreIndexUrl}`
|
||||
);
|
||||
}
|
||||
|
||||
return releaseInfo['channel-version'];
|
||||
}
|
||||
|
||||
static DotNetCoreIndexUrl =
|
||||
static DotnetCoreIndexUrl =
|
||||
'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
|
||||
}
|
||||
|
||||
export class DotnetCoreInstaller {
|
||||
private version: string;
|
||||
private quality: QualityOptions;
|
||||
export class DotnetInstallScript {
|
||||
private scriptName = IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
|
||||
private escapedScript: string;
|
||||
private scriptArguments: string[] = [];
|
||||
|
||||
constructor() {
|
||||
this.escapedScript = path
|
||||
.join(__dirname, '..', '..', 'externals', this.scriptName)
|
||||
.replace(/'/g, "''");
|
||||
|
||||
static {
|
||||
const installationDirectoryWindows = path.join(
|
||||
process.env['PROGRAMFILES'] + '',
|
||||
'dotnet'
|
||||
);
|
||||
const installationDirectoryLinux = '/usr/share/dotnet';
|
||||
const installationDirectoryMac = path.join(
|
||||
process.env['HOME'] + '',
|
||||
'.dotnet'
|
||||
);
|
||||
const dotnetInstallDir: string | undefined =
|
||||
process.env['DOTNET_INSTALL_DIR'];
|
||||
if (dotnetInstallDir) {
|
||||
process.env['DOTNET_INSTALL_DIR'] =
|
||||
this.convertInstallPathToAbsolute(dotnetInstallDir);
|
||||
} else {
|
||||
if (IS_WINDOWS) {
|
||||
process.env['DOTNET_INSTALL_DIR'] = installationDirectoryWindows;
|
||||
} else {
|
||||
process.env['DOTNET_INSTALL_DIR'] = IS_LINUX
|
||||
? installationDirectoryLinux
|
||||
: installationDirectoryMac;
|
||||
}
|
||||
}
|
||||
this.setupScriptPowershell();
|
||||
return;
|
||||
}
|
||||
|
||||
constructor(version: string, quality: QualityOptions) {
|
||||
this.version = version;
|
||||
this.quality = quality;
|
||||
this.setupScriptBash();
|
||||
}
|
||||
|
||||
private static convertInstallPathToAbsolute(installDir: string): string {
|
||||
let transformedPath;
|
||||
if (path.isAbsolute(installDir)) {
|
||||
transformedPath = installDir;
|
||||
} else {
|
||||
transformedPath = installDir.startsWith('~')
|
||||
? path.join(os.homedir(), installDir.slice(1))
|
||||
: (transformedPath = path.join(process.cwd(), installDir));
|
||||
}
|
||||
return path.normalize(transformedPath);
|
||||
}
|
||||
|
||||
static addToPath() {
|
||||
core.addPath(process.env['DOTNET_INSTALL_DIR']!);
|
||||
core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
|
||||
}
|
||||
|
||||
private setQuality(
|
||||
dotnetVersion: DotnetVersion,
|
||||
scriptArguments: string[]
|
||||
): void {
|
||||
const option = IS_WINDOWS ? '-Quality' : '--quality';
|
||||
if (dotnetVersion.qualityFlag) {
|
||||
scriptArguments.push(option, this.quality);
|
||||
} else {
|
||||
core.warning(
|
||||
`The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
public async installDotnet(): Promise<string | null> {
|
||||
const windowsDefaultOptions = [
|
||||
private setupScriptPowershell() {
|
||||
this.scriptArguments = [
|
||||
'-NoLogo',
|
||||
'-Sta',
|
||||
'-NoProfile',
|
||||
|
|
@ -201,61 +153,120 @@ export class DotnetCoreInstaller {
|
|||
'Unrestricted',
|
||||
'-Command'
|
||||
];
|
||||
const scriptName = IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
|
||||
const escapedScript = path
|
||||
.join(__dirname, '..', '..', 'externals', scriptName)
|
||||
.replace(/'/g, "''");
|
||||
let scriptArguments: string[];
|
||||
let scriptPath = '';
|
||||
|
||||
const versionResolver = new DotnetVersionResolver(this.version);
|
||||
const dotnetVersion = await versionResolver.createDotNetVersion();
|
||||
|
||||
if (IS_WINDOWS) {
|
||||
scriptArguments = ['&', `'${escapedScript}'`];
|
||||
|
||||
if (dotnetVersion.type) {
|
||||
scriptArguments.push(dotnetVersion.type, dotnetVersion.value);
|
||||
}
|
||||
|
||||
if (this.quality) {
|
||||
this.setQuality(dotnetVersion, scriptArguments);
|
||||
}
|
||||
this.scriptArguments.push('&', `'${this.escapedScript}'`);
|
||||
|
||||
if (process.env['https_proxy'] != null) {
|
||||
scriptArguments.push(`-ProxyAddress ${process.env['https_proxy']}`);
|
||||
this.scriptArguments.push(`-ProxyAddress ${process.env['https_proxy']}`);
|
||||
}
|
||||
// This is not currently an option
|
||||
if (process.env['no_proxy'] != null) {
|
||||
scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
|
||||
this.scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
|
||||
}
|
||||
}
|
||||
|
||||
scriptPath =
|
||||
(await io.which('pwsh', false)) || (await io.which('powershell', true));
|
||||
scriptArguments = windowsDefaultOptions.concat(scriptArguments);
|
||||
} else {
|
||||
chmodSync(escapedScript, '777');
|
||||
scriptPath = await io.which(escapedScript, true);
|
||||
scriptArguments = [];
|
||||
private setupScriptBash() {
|
||||
chmodSync(this.escapedScript, '777');
|
||||
}
|
||||
|
||||
private async getScriptPath() {
|
||||
if (IS_WINDOWS) {
|
||||
return (await io.which('pwsh', false)) || io.which('powershell', true);
|
||||
}
|
||||
|
||||
return io.which(this.escapedScript, true);
|
||||
}
|
||||
|
||||
public useArguments(...args: string[]) {
|
||||
this.scriptArguments.push(...args);
|
||||
return this;
|
||||
}
|
||||
|
||||
public useVersion(dotnetVersion: DotnetVersion, quality?: QualityOptions) {
|
||||
if (dotnetVersion.type) {
|
||||
scriptArguments.push(dotnetVersion.type, dotnetVersion.value);
|
||||
this.useArguments(dotnetVersion.type, dotnetVersion.value);
|
||||
}
|
||||
|
||||
if (this.quality) {
|
||||
this.setQuality(dotnetVersion, scriptArguments);
|
||||
if (quality && !dotnetVersion.qualityFlag) {
|
||||
core.warning(
|
||||
`The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${dotnetVersion.value}. 'dotnet-quality' input is ignored.`
|
||||
);
|
||||
return this;
|
||||
}
|
||||
|
||||
if (quality) {
|
||||
this.useArguments(IS_WINDOWS ? '-Quality' : '--quality', quality);
|
||||
}
|
||||
// process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public async execute() {
|
||||
const getExecOutputOptions = {
|
||||
ignoreReturnCode: true,
|
||||
env: process.env as {string: string}
|
||||
};
|
||||
const {exitCode, stdout, stderr} = await exec.getExecOutput(
|
||||
`"${scriptPath}"`,
|
||||
scriptArguments,
|
||||
|
||||
return exec.getExecOutput(
|
||||
`"${await this.getScriptPath()}"`,
|
||||
this.scriptArguments,
|
||||
getExecOutputOptions
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export abstract class DotnetInstallDir {
|
||||
private static readonly default = {
|
||||
linux: '/usr/share/dotnet',
|
||||
mac: path.join(process.env['HOME'] + '', '.dotnet'),
|
||||
windows: path.join(process.env['PROGRAMFILES'] + '', 'dotnet')
|
||||
};
|
||||
|
||||
public static readonly dirPath = process.env['DOTNET_INSTALL_DIR']
|
||||
? DotnetInstallDir.convertInstallPathToAbsolute(
|
||||
process.env['DOTNET_INSTALL_DIR']
|
||||
)
|
||||
: DotnetInstallDir.default[PLATFORM];
|
||||
|
||||
private static convertInstallPathToAbsolute(installDir: string): string {
|
||||
if (path.isAbsolute(installDir)) return path.normalize(installDir);
|
||||
|
||||
const transformedPath = installDir.startsWith('~')
|
||||
? path.join(os.homedir(), installDir.slice(1))
|
||||
: path.join(process.cwd(), installDir);
|
||||
|
||||
return path.normalize(transformedPath);
|
||||
}
|
||||
|
||||
public static addToPath() {
|
||||
core.addPath(process.env['DOTNET_INSTALL_DIR']!);
|
||||
core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
|
||||
}
|
||||
|
||||
public static setEnvironmentVariable() {
|
||||
process.env['DOTNET_INSTALL_DIR'] = DotnetInstallDir.dirPath;
|
||||
}
|
||||
}
|
||||
|
||||
export class DotnetCoreInstaller {
|
||||
static {
|
||||
DotnetInstallDir.setEnvironmentVariable();
|
||||
}
|
||||
|
||||
constructor(private version: string, private quality: QualityOptions) {}
|
||||
|
||||
public async installDotnet(): Promise<string | null> {
|
||||
const versionResolver = new DotnetVersionResolver(this.version);
|
||||
const dotnetVersion = await versionResolver.createDotnetVersion();
|
||||
|
||||
const installScript = new DotnetInstallScript()
|
||||
.useArguments(
|
||||
IS_WINDOWS ? '-SkipNonVersionedFiles' : '--skip-non-versioned-files'
|
||||
)
|
||||
.useVersion(dotnetVersion, this.quality);
|
||||
|
||||
const {exitCode, stderr, stdout} = await installScript.execute();
|
||||
|
||||
if (exitCode) {
|
||||
throw new Error(
|
||||
`Failed to install dotnet, exit code: ${exitCode}. ${stderr}`
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import * as core from '@actions/core';
|
||||
import {DotnetCoreInstaller} from './installer';
|
||||
import {DotnetCoreInstaller, DotnetInstallDir} from './installer';
|
||||
import * as fs from 'fs';
|
||||
import path from 'path';
|
||||
import semver from 'semver';
|
||||
|
|
@ -72,7 +72,7 @@ export async function run() {
|
|||
const installedVersion = await dotnetInstaller.installDotnet();
|
||||
installedDotnetVersions.push(installedVersion);
|
||||
}
|
||||
DotnetCoreInstaller.addToPath();
|
||||
DotnetInstallDir.addToPath();
|
||||
}
|
||||
|
||||
const sourceUrl: string = core.getInput('source-url');
|
||||
|
|
|
|||
|
|
@ -1,2 +1,6 @@
|
|||
export const IS_WINDOWS = process.platform === 'win32';
|
||||
export const IS_LINUX = process.platform === 'linux';
|
||||
export const PLATFORM = ((): 'windows' | 'linux' | 'mac' => {
|
||||
if (process.platform === 'win32') return 'windows';
|
||||
if (process.platform === 'linux') return 'linux';
|
||||
return 'mac';
|
||||
})();
|
||||
|
|
|
|||
Loading…
Reference in New Issue