actions/setup-ruby
1
0
Fork 0
mirror of https://github.com/ruby/setup-ruby.git synced 2026-09-13 22:44:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use an array of PATH entries rather a string or null

Browse Source
This commit is contained in:
Benoit Daloze
2020-03-07 14:13:52 +01:00
parent bd9411e978
commit 2e093de9b3
4 changed files with 50 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.js
+5 -16
View File
@@ -18,12 +18,10 @@ async function run() {
const engineVersions = installer.getAvailableVersions(platform, engine)
const ruby = validateRubyEngineAndVersion(platform, engineVersions, engine, version)
// toolsPath is Windows build tools path additions
const [rubyPrefix, toolsPath] = await installer.install(platform, ruby)
const [rubyPrefix, newPathEntries] = await installer.install(platform, ruby)
await setupPath(rubyPrefix, ruby, toolsPath)
core.setOutput('ruby-prefix', rubyPrefix, toolsPath)
setupPath(ruby, newPathEntries)
core.setOutput('ruby-prefix', rubyPrefix)
} catch (error) {
core.setFailed(error.message)
}
@@ -107,9 +105,8 @@ function findUbuntuVersion() {
}
}
function setupPath(rubyPrefix, ruby, toolsPath) {
function setupPath(ruby, newPathEntries) {
const originalPath = process.env['PATH'].split(path.delimiter)
let cleanPath = originalPath.filter(e => !/\bruby\b/i.test(e))
if (cleanPath.length !== originalPath.length) {
@@ -121,15 +118,7 @@ function setupPath(rubyPrefix, ruby, toolsPath) {
}
}
let newPath = [path.join(rubyPrefix, 'bin')]
if (ruby.startsWith('rubinius')) {
newPath.push(path.join(rubyPrefix, 'gems', 'bin'))
}
if (toolsPath) { newPath.push(toolsPath) }
core.exportVariable('PATH', [...newPath, ...cleanPath].join(path.delimiter))
core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
}
run()