change install dir

This commit is contained in:
dsame 2023-11-08 09:20:14 +01:00
parent 2216f56ae1
commit e968ad80c6
3 changed files with 36 additions and 6 deletions

20
dist/setup/index.js vendored
View File

@ -72836,7 +72836,7 @@ const core = __importStar(__nccwpck_require__(2186));
const exec = __importStar(__nccwpck_require__(1514)); const exec = __importStar(__nccwpck_require__(1514));
const io = __importStar(__nccwpck_require__(7436)); const io = __importStar(__nccwpck_require__(7436));
const hc = __importStar(__nccwpck_require__(6255)); const hc = __importStar(__nccwpck_require__(6255));
const fs_1 = __nccwpck_require__(7147); const fs_1 = __importStar(__nccwpck_require__(7147));
const path_1 = __importDefault(__nccwpck_require__(1017)); const path_1 = __importDefault(__nccwpck_require__(1017));
const os_1 = __importDefault(__nccwpck_require__(2037)); const os_1 = __importDefault(__nccwpck_require__(2037));
const semver_1 = __importDefault(__nccwpck_require__(5911)); const semver_1 = __importDefault(__nccwpck_require__(5911));
@ -73008,6 +73008,16 @@ class DotnetInstallScript {
} }
} }
exports.DotnetInstallScript = DotnetInstallScript; exports.DotnetInstallScript = DotnetInstallScript;
// Workaround for slow installation on Windows with network attached C: drive
// see https://github.com/actions/setup-dotnet/issues/260
const fixWindowsInstallDir = (installDir) => {
if (!(0, utils_1.isSelfHosted)() && fs_1.default.existsSync('d:\\')) {
return installDir.replace(/^[cC]:\\/, 'd:\\');
}
else {
return installDir;
}
};
class DotnetInstallDir { class DotnetInstallDir {
static convertInstallPathToAbsolute(installDir) { static convertInstallPathToAbsolute(installDir) {
if (path_1.default.isAbsolute(installDir)) if (path_1.default.isAbsolute(installDir))
@ -73029,7 +73039,7 @@ exports.DotnetInstallDir = DotnetInstallDir;
DotnetInstallDir.default = { DotnetInstallDir.default = {
linux: '/usr/share/dotnet', linux: '/usr/share/dotnet',
mac: path_1.default.join(process.env['HOME'] + '', '.dotnet'), mac: path_1.default.join(process.env['HOME'] + '', '.dotnet'),
windows: path_1.default.join(process.env['PROGRAMFILES'] + '', 'dotnet') windows: fixWindowsInstallDir(path_1.default.join(process.env['PROGRAMFILES'] + '', 'dotnet'))
}; };
DotnetInstallDir.dirPath = process.env['DOTNET_INSTALL_DIR'] DotnetInstallDir.dirPath = process.env['DOTNET_INSTALL_DIR']
? DotnetInstallDir.convertInstallPathToAbsolute(process.env['DOTNET_INSTALL_DIR']) ? DotnetInstallDir.convertInstallPathToAbsolute(process.env['DOTNET_INSTALL_DIR'])
@ -73272,7 +73282,7 @@ run();
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.PLATFORM = exports.IS_WINDOWS = void 0; exports.isSelfHosted = exports.PLATFORM = exports.IS_WINDOWS = void 0;
exports.IS_WINDOWS = process.platform === 'win32'; exports.IS_WINDOWS = process.platform === 'win32';
exports.PLATFORM = (() => { exports.PLATFORM = (() => {
if (process.platform === 'win32') if (process.platform === 'win32')
@ -73281,6 +73291,10 @@ exports.PLATFORM = (() => {
return 'linux'; return 'linux';
return 'mac'; return 'mac';
})(); })();
const isSelfHosted = () => process.env['AGENT_ISSELFHOSTED'] === '1' ||
(process.env['AGENT_ISSELFHOSTED'] === undefined &&
process.env['RUNNER_ENVIRONMENT'] !== 'github-hosted');
exports.isSelfHosted = isSelfHosted;
/***/ }), /***/ }),

View File

@ -3,11 +3,11 @@ import * as core from '@actions/core';
import * as exec from '@actions/exec'; import * as exec from '@actions/exec';
import * as io from '@actions/io'; import * as io from '@actions/io';
import * as hc from '@actions/http-client'; import * as hc from '@actions/http-client';
import {chmodSync} from 'fs'; import fs, {chmodSync} from 'fs';
import path from 'path'; import path from 'path';
import os from 'os'; import os from 'os';
import semver from 'semver'; import semver from 'semver';
import {IS_WINDOWS, PLATFORM} from './utils'; import {IS_WINDOWS, isSelfHosted, PLATFORM} from './utils';
import {QualityOptions} from './setup-dotnet'; import {QualityOptions} from './setup-dotnet';
export interface DotnetVersion { export interface DotnetVersion {
@ -215,11 +215,23 @@ export class DotnetInstallScript {
} }
} }
// Workaround for slow installation on Windows with network attached C: drive
// see https://github.com/actions/setup-dotnet/issues/260
const fixWindowsInstallDir = (installDir: string): string => {
if (!isSelfHosted() && fs.existsSync('d:\\')) {
return installDir.replace(/^[cC]:\\/, 'd:\\');
} else {
return installDir;
}
};
export abstract class DotnetInstallDir { export abstract class DotnetInstallDir {
private static readonly default = { private static readonly default = {
linux: '/usr/share/dotnet', linux: '/usr/share/dotnet',
mac: path.join(process.env['HOME'] + '', '.dotnet'), mac: path.join(process.env['HOME'] + '', '.dotnet'),
windows: path.join(process.env['PROGRAMFILES'] + '', 'dotnet') windows: fixWindowsInstallDir(
path.join(process.env['PROGRAMFILES'] + '', 'dotnet')
)
}; };
public static readonly dirPath = process.env['DOTNET_INSTALL_DIR'] public static readonly dirPath = process.env['DOTNET_INSTALL_DIR']

View File

@ -4,3 +4,7 @@ export const PLATFORM = ((): 'windows' | 'linux' | 'mac' => {
if (process.platform === 'linux') return 'linux'; if (process.platform === 'linux') return 'linux';
return 'mac'; return 'mac';
})(); })();
export const isSelfHosted = (): boolean =>
process.env['AGENT_ISSELFHOSTED'] === '1' ||
(process.env['AGENT_ISSELFHOSTED'] === undefined &&
process.env['RUNNER_ENVIRONMENT'] !== 'github-hosted');