Actions/setup-dotnet
1
Fork 0
mirror of https://github.com/actions/setup-dotnet.git synced 2025-08-20 07:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with DOTNET_INSTALL_DIR env.var

Browse Source
This commit is contained in:
IvanZosimov 2022-09-30 14:11:07 +02:00
parent c7e7147fd3
commit b4e0d356f9
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dist/index.js vendored
View File

@ -333,7 +333,9 @@ class DotnetCoreInstaller {
if (process.env['no_proxy'] != null) { if (process.env['no_proxy'] != null) {
scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`); scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
} }
scriptArguments.push('-InstallDir', `'${DotnetCoreInstaller.installationDirectoryWindows}'`); if (!process.env['DOTNET_INSTALL_DIR']) {
scriptArguments.push('-InstallDir', `'${DotnetCoreInstaller.installationDirectoryWindows}'`);
}
// process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
scriptPath = scriptPath =
(yield io.which('pwsh', false)) || (yield io.which('powershell', true)); (yield io.which('pwsh', false)) || (yield io.which('powershell', true));
@ -349,18 +351,19 @@ class DotnetCoreInstaller {
if (this.quality) { if (this.quality) {
this.setQuality(dotnetVersion, scriptArguments); this.setQuality(dotnetVersion, scriptArguments);
} }
if (utils_1.IS_LINUX) { if (!process.env['DOTNET_INSTALL_DIR']) {
scriptArguments.push('--install-dir', DotnetCoreInstaller.installationDirectoryLinux); scriptArguments.push('--install-dir', utils_1.IS_LINUX
} ? DotnetCoreInstaller.installationDirectoryLinux
if (utils_1.IS_MAC) { : DotnetCoreInstaller.installationDirectoryMac);
scriptArguments.push('--install-dir', DotnetCoreInstaller.installationDirectoryMac);
} }
} }
const { exitCode, stdout } = yield exec.getExecOutput(`"${scriptPath}"`, scriptArguments, { ignoreReturnCode: true }); const { exitCode, stdout } = yield exec.getExecOutput(`"${scriptPath}"`, scriptArguments, { ignoreReturnCode: true });
if (exitCode) { if (exitCode) {
throw new Error(`Failed to install dotnet ${exitCode}. ${stdout}`); throw new Error(`Failed to install dotnet ${exitCode}. ${stdout}`);
} }
return this.outputDotnetVersion(dotnetVersion.value, scriptArguments[scriptArguments.length - 1]); return this.outputDotnetVersion(dotnetVersion.value, process.env['DOTNET_INSTALL_DIR']
? process.env['DOTNET_INSTALL_DIR']
: scriptArguments[scriptArguments.length - 1]);
}); });
} }
outputDotnetVersion(version, installationPath) { outputDotnetVersion(version, installationPath) {
@ -523,10 +526,9 @@ run();
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.IS_MAC = exports.IS_LINUX = exports.IS_WINDOWS = void 0; exports.IS_LINUX = exports.IS_WINDOWS = void 0;
exports.IS_WINDOWS = process.platform === 'win32'; exports.IS_WINDOWS = process.platform === 'win32';
exports.IS_LINUX = process.platform === 'linux'; exports.IS_LINUX = process.platform === 'linux';
exports.IS_MAC = process.platform === 'darwin';
/***/ }), /***/ }),

29
src/installer.ts
View File

@ -7,7 +7,7 @@ import {chmodSync} from 'fs';
import {readdir} from 'fs/promises'; import {readdir} from 'fs/promises';
import path from 'path'; import path from 'path';
import semver from 'semver'; import semver from 'semver';
import {IS_LINUX, IS_WINDOWS, IS_MAC} from './utils'; import {IS_LINUX, IS_WINDOWS} from './utils';
import {QualityOptions} from './setup-dotnet'; import {QualityOptions} from './setup-dotnet';
export interface DotnetVersion { export interface DotnetVersion {
@ -208,10 +208,12 @@ export class DotnetCoreInstaller {
scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`); scriptArguments.push(`-ProxyBypassList ${process.env['no_proxy']}`);
} }
scriptArguments.push( if (!process.env['DOTNET_INSTALL_DIR']) {
'-InstallDir', scriptArguments.push(
`'${DotnetCoreInstaller.installationDirectoryWindows}'` '-InstallDir',
); `'${DotnetCoreInstaller.installationDirectoryWindows}'`
);
}
// process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
scriptPath = scriptPath =
(await io.which('pwsh', false)) || (await io.which('powershell', true)); (await io.which('pwsh', false)) || (await io.which('powershell', true));
@ -229,17 +231,12 @@ export class DotnetCoreInstaller {
this.setQuality(dotnetVersion, scriptArguments); this.setQuality(dotnetVersion, scriptArguments);
} }
if (IS_LINUX) { if (!process.env['DOTNET_INSTALL_DIR']) {
scriptArguments.push( scriptArguments.push(
'--install-dir', '--install-dir',
DotnetCoreInstaller.installationDirectoryLinux IS_LINUX
); ? DotnetCoreInstaller.installationDirectoryLinux
} : DotnetCoreInstaller.installationDirectoryMac
if (IS_MAC) {
scriptArguments.push(
'--install-dir',
DotnetCoreInstaller.installationDirectoryMac
); );
} }
} }
@ -254,7 +251,9 @@ export class DotnetCoreInstaller {
return this.outputDotnetVersion( return this.outputDotnetVersion(
dotnetVersion.value, dotnetVersion.value,
scriptArguments[scriptArguments.length - 1] process.env['DOTNET_INSTALL_DIR']
? process.env['DOTNET_INSTALL_DIR']
: scriptArguments[scriptArguments.length - 1]
); );
} }

1
src/utils.ts
View File

@ -1,3 +1,2 @@
export const IS_WINDOWS = process.platform === 'win32'; export const IS_WINDOWS = process.platform === 'win32';
export const IS_LINUX = process.platform === 'linux'; export const IS_LINUX = process.platform === 'linux';
export const IS_MAC = process.platform === 'darwin';