Consider a different $RUNNER_TOOL_CACHE than the default as a self-hosted runner

* Fixes https://github.com/ruby/setup-ruby/issues/242
This commit is contained in:
Benoit Daloze
2023-03-03 18:01:46 +01:00
parent 66dc012cc3
commit 377a94bc68
3 changed files with 39 additions and 26 deletions
+18 -12
View File
@@ -162,9 +162,12 @@ const GitHubHostedPlatforms = [
'windows-2022-x64', 'windows-2022-x64',
] ]
// Actually a self-hosted runner which does not correspond to a GitHub-hosted runner image // Actually a self-hosted runner for which either
// * the OS and OS version does not correspond to a GitHub-hosted runner image,
// * or the hosted tool cache is different from the default tool cache path
export function isSelfHostedRunner() { export function isSelfHostedRunner() {
return !GitHubHostedPlatforms.includes(getOSNameVersionArch()) return !GitHubHostedPlatforms.includes(getOSNameVersionArch()) ||
getRunnerToolCache() !== getDefaultToolCachePath()
} }
let virtualEnvironmentName = undefined let virtualEnvironmentName = undefined
@@ -213,28 +216,31 @@ export function shouldUseToolCache(engine, version) {
return (engine === 'ruby' && !isHeadVersion(version)) || isSelfHostedRunner() return (engine === 'ruby' && !isHeadVersion(version)) || isSelfHostedRunner()
} }
function getPlatformToolCache(platform) { export function getRunnerToolCache() {
if (isSelfHostedRunner()) { const runnerToolCache = process.env['RUNNER_TOOL_CACHE']
const runnerToolCache = process.env['RUNNER_TOOL_CACHE'] if (!runnerToolCache) {
if (!runnerToolCache) { throw new Error('$RUNNER_TOOL_CACHE must be set')
throw new Error('$RUNNER_TOOL_CACHE must be set on self-hosted runners')
}
return runnerToolCache
} }
// Hardcode paths rather than using $RUNNER_TOOL_CACHE because the prebuilt Rubies cannot be moved anyway return runnerToolCache
}
// Rubies prebuilt by this action embed this path rather than using $RUNNER_TOOL_CACHE,
// so they can only be used if the two paths are the same
function getDefaultToolCachePath() {
const platform = getVirtualEnvironmentName()
if (platform.startsWith('ubuntu-')) { if (platform.startsWith('ubuntu-')) {
return '/opt/hostedtoolcache' return '/opt/hostedtoolcache'
} else if (platform.startsWith('macos-')) { } else if (platform.startsWith('macos-')) {
return '/Users/runner/hostedtoolcache' return '/Users/runner/hostedtoolcache'
} else if (platform.startsWith('windows-')) { } else if (platform.startsWith('windows-')) {
return 'C:/hostedtoolcache/windows' return 'C:\\hostedtoolcache\\windows'
} else { } else {
throw new Error('Unknown platform') throw new Error('Unknown platform')
} }
} }
export function getToolCacheRubyPrefix(platform, engine, version) { export function getToolCacheRubyPrefix(platform, engine, version) {
const toolCache = getPlatformToolCache(platform) const toolCache = getRunnerToolCache()
const name = { const name = {
ruby: 'Ruby', ruby: 'Ruby',
jruby: 'JRuby', jruby: 'JRuby',
Generated Vendored
+20 -13
View File
@@ -291,6 +291,7 @@ __nccwpck_require__.d(__webpack_exports__, {
"drive": () => (/* binding */ drive), "drive": () => (/* binding */ drive),
"floatVersion": () => (/* binding */ floatVersion), "floatVersion": () => (/* binding */ floatVersion),
"getOSNameVersionArch": () => (/* binding */ getOSNameVersionArch), "getOSNameVersionArch": () => (/* binding */ getOSNameVersionArch),
"getRunnerToolCache": () => (/* binding */ getRunnerToolCache),
"getToolCacheRubyPrefix": () => (/* binding */ getToolCacheRubyPrefix), "getToolCacheRubyPrefix": () => (/* binding */ getToolCacheRubyPrefix),
"getVirtualEnvironmentName": () => (/* binding */ getVirtualEnvironmentName), "getVirtualEnvironmentName": () => (/* binding */ getVirtualEnvironmentName),
"hasBundlerDefaultGem": () => (/* binding */ hasBundlerDefaultGem), "hasBundlerDefaultGem": () => (/* binding */ hasBundlerDefaultGem),
@@ -514,9 +515,12 @@ const GitHubHostedPlatforms = [
'windows-2022-x64', 'windows-2022-x64',
] ]
// Actually a self-hosted runner which does not correspond to a GitHub-hosted runner image // Actually a self-hosted runner for which either
// * the OS and OS version does not correspond to a GitHub-hosted runner image,
// * or the hosted tool cache is different from the default tool cache path
function isSelfHostedRunner() { function isSelfHostedRunner() {
return !GitHubHostedPlatforms.includes(getOSNameVersionArch()) return !GitHubHostedPlatforms.includes(getOSNameVersionArch()) ||
getRunnerToolCache() !== getDefaultToolCachePath()
} }
let virtualEnvironmentName = undefined let virtualEnvironmentName = undefined
@@ -565,28 +569,31 @@ function shouldUseToolCache(engine, version) {
return (engine === 'ruby' && !isHeadVersion(version)) || isSelfHostedRunner() return (engine === 'ruby' && !isHeadVersion(version)) || isSelfHostedRunner()
} }
function getPlatformToolCache(platform) { function getRunnerToolCache() {
if (isSelfHostedRunner()) { const runnerToolCache = process.env['RUNNER_TOOL_CACHE']
const runnerToolCache = process.env['RUNNER_TOOL_CACHE'] if (!runnerToolCache) {
if (!runnerToolCache) { throw new Error('$RUNNER_TOOL_CACHE must be set')
throw new Error('$RUNNER_TOOL_CACHE must be set on self-hosted runners')
}
return runnerToolCache
} }
// Hardcode paths rather than using $RUNNER_TOOL_CACHE because the prebuilt Rubies cannot be moved anyway return runnerToolCache
}
// Rubies prebuilt by this action embed this path rather than using $RUNNER_TOOL_CACHE,
// so they can only be used if the two paths are the same
function getDefaultToolCachePath() {
const platform = getVirtualEnvironmentName()
if (platform.startsWith('ubuntu-')) { if (platform.startsWith('ubuntu-')) {
return '/opt/hostedtoolcache' return '/opt/hostedtoolcache'
} else if (platform.startsWith('macos-')) { } else if (platform.startsWith('macos-')) {
return '/Users/runner/hostedtoolcache' return '/Users/runner/hostedtoolcache'
} else if (platform.startsWith('windows-')) { } else if (platform.startsWith('windows-')) {
return 'C:/hostedtoolcache/windows' return 'C:\\hostedtoolcache\\windows'
} else { } else {
throw new Error('Unknown platform') throw new Error('Unknown platform')
} }
} }
function getToolCacheRubyPrefix(platform, engine, version) { function getToolCacheRubyPrefix(platform, engine, version) {
const toolCache = getPlatformToolCache(platform) const toolCache = getRunnerToolCache()
const name = { const name = {
ruby: 'Ruby', ruby: 'Ruby',
jruby: 'JRuby', jruby: 'JRuby',
@@ -68253,7 +68260,7 @@ async function install(platform, engine, version) {
if (common.isSelfHostedRunner()) { if (common.isSelfHostedRunner()) {
const rubyBuildDefinition = engine === 'ruby' ? version : `${engine}-${version}` const rubyBuildDefinition = engine === 'ruby' ? version : `${engine}-${version}`
core.error( core.error(
`The current runner (${common.getOSNameVersionArch()}) was detected as self-hosted and not matching a GitHub-hosted runner image.\n` + `The current runner (${common.getOSNameVersionArch()}, RUNNER_TOOL_CACHE=${common.getRunnerToolCache()}) was detected as self-hosted and not matching a GitHub-hosted runner image.\n` +
`In such a case, you should install Ruby in the $RUNNER_TOOL_CACHE yourself, for example using https://github.com/rbenv/ruby-build:\n` + `In such a case, you should install Ruby in the $RUNNER_TOOL_CACHE yourself, for example using https://github.com/rbenv/ruby-build:\n` +
`You can take inspiration from this workflow for more details: https://github.com/ruby/ruby-builder/blob/master/.github/workflows/build.yml\n` + `You can take inspiration from this workflow for more details: https://github.com/ruby/ruby-builder/blob/master/.github/workflows/build.yml\n` +
`$ ruby-build ${rubyBuildDefinition} ${toolCacheRubyPrefix}\n` + `$ ruby-build ${rubyBuildDefinition} ${toolCacheRubyPrefix}\n` +
+1 -1
View File
@@ -28,7 +28,7 @@ export async function install(platform, engine, version) {
if (common.isSelfHostedRunner()) { if (common.isSelfHostedRunner()) {
const rubyBuildDefinition = engine === 'ruby' ? version : `${engine}-${version}` const rubyBuildDefinition = engine === 'ruby' ? version : `${engine}-${version}`
core.error( core.error(
`The current runner (${common.getOSNameVersionArch()}) was detected as self-hosted and not matching a GitHub-hosted runner image.\n` + `The current runner (${common.getOSNameVersionArch()}, RUNNER_TOOL_CACHE=${common.getRunnerToolCache()}) was detected as self-hosted and not matching a GitHub-hosted runner image.\n` +
`In such a case, you should install Ruby in the $RUNNER_TOOL_CACHE yourself, for example using https://github.com/rbenv/ruby-build:\n` + `In such a case, you should install Ruby in the $RUNNER_TOOL_CACHE yourself, for example using https://github.com/rbenv/ruby-build:\n` +
`You can take inspiration from this workflow for more details: https://github.com/ruby/ruby-builder/blob/master/.github/workflows/build.yml\n` + `You can take inspiration from this workflow for more details: https://github.com/ruby/ruby-builder/blob/master/.github/workflows/build.yml\n` +
`$ ruby-build ${rubyBuildDefinition} ${toolCacheRubyPrefix}\n` + `$ ruby-build ${rubyBuildDefinition} ${toolCacheRubyPrefix}\n` +