refactor conditions

This commit is contained in:
Sergey Dolin 2023-07-17 14:47:01 +02:00
parent 00f551b2d1
commit 8998c6804e
2 changed files with 50 additions and 49 deletions

15
dist/setup/index.js vendored
View file

@ -61466,14 +61466,17 @@ function installGoVersion(info, auth, arch) {
} }
// for github hosted windows runner handle latency of OS drive // for github hosted windows runner handle latency of OS drive
// by avoiding write operations to C: // by avoiding write operations to C:
if (!isWindows)
return addExecutablesToCache(extPath, info, arch);
const isHosted = process.env['RUNNER_ENVIRONMENT'] === 'github-hosted' || const isHosted = process.env['RUNNER_ENVIRONMENT'] === 'github-hosted' ||
process.env['AGENT_ISSELFHOSTED'] === '0'; process.env['AGENT_ISSELFHOSTED'] === '0';
if (!isHosted)
return addExecutablesToCache(extPath, info, arch);
const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE']; const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE'];
if (isWindows && if (!defaultToolCacheRoot)
defaultToolCacheRoot && return addExecutablesToCache(extPath, info, arch);
isHosted && if (!fs_1.default.existsSync('d:\\') || !fs_1.default.existsSync('c:\\'))
fs_1.default.existsSync('d:\\') && return addExecutablesToCache(extPath, info, arch);
fs_1.default.existsSync('c:\\')) {
const substitutedToolCacheRoot = defaultToolCacheRoot const substitutedToolCacheRoot = defaultToolCacheRoot
.replace('C:', 'D:') .replace('C:', 'D:')
.replace('c:', 'd:'); .replace('c:', 'd:');
@ -61489,8 +61492,6 @@ function installGoVersion(info, auth, arch) {
process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot; process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot;
// make outer code to continue using toolcache as if it were installed on c: // make outer code to continue using toolcache as if it were installed on c:
return defaultToolCacheDir; return defaultToolCacheDir;
}
return yield addExecutablesToCache(extPath, info, arch);
}); });
} }
function extractGoArchive(archivePath) { function extractGoArchive(archivePath) {

View file

@ -203,17 +203,20 @@ async function installGoVersion(
// for github hosted windows runner handle latency of OS drive // for github hosted windows runner handle latency of OS drive
// by avoiding write operations to C: // by avoiding write operations to C:
if (!isWindows) return addExecutablesToCache(extPath, info, arch);
const isHosted = const isHosted =
process.env['RUNNER_ENVIRONMENT'] === 'github-hosted' || process.env['RUNNER_ENVIRONMENT'] === 'github-hosted' ||
process.env['AGENT_ISSELFHOSTED'] === '0'; process.env['AGENT_ISSELFHOSTED'] === '0';
if (!isHosted) return addExecutablesToCache(extPath, info, arch);
const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE']; const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE'];
if ( if (!defaultToolCacheRoot) return addExecutablesToCache(extPath, info, arch);
isWindows &&
defaultToolCacheRoot && if (!fs.existsSync('d:\\') || !fs.existsSync('c:\\'))
isHosted && return addExecutablesToCache(extPath, info, arch);
fs.existsSync('d:\\') &&
fs.existsSync('c:\\')
) {
const substitutedToolCacheRoot = defaultToolCacheRoot const substitutedToolCacheRoot = defaultToolCacheRoot
.replace('C:', 'D:') .replace('C:', 'D:')
.replace('c:', 'd:'); .replace('c:', 'd:');
@ -236,9 +239,6 @@ async function installGoVersion(
// make outer code to continue using toolcache as if it were installed on c: // make outer code to continue using toolcache as if it were installed on c:
return defaultToolCacheDir; return defaultToolCacheDir;
}
return await addExecutablesToCache(extPath, info, arch);
} }
export async function extractGoArchive(archivePath: string): Promise<string> { export async function extractGoArchive(archivePath: string): Promise<string> {