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

Fix value for options

Browse Source
This commit is contained in:
Benoit Daloze
2020-12-07 21:12:36 +01:00
parent cadade3366
commit e5a267414f
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+4 -2
View File
@@ -27744,7 +27744,7 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
}) })
await common.measure('Extracting Ruby', async () => await common.measure('Extracting Ruby', async () =>
exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${parentDir}`], {silent: true})) exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${parentDir}`], { silent: true }))
if (base !== path.basename(rubyPrefix)) { if (base !== path.basename(rubyPrefix)) {
await io.mv(path.join(parentDir, base), rubyPrefix) await io.mv(path.join(parentDir, base), rubyPrefix)
@@ -51434,9 +51434,11 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b
return false return false
} }
// Before the lockfile exists, we need to specify which Bundler version to use explicitly
const optionsWithBundlerVersion = { env: { ...process.env, BUNDLER_VERSION: bundlerVersion } }
// config // config
const path = 'vendor/bundle' const path = 'vendor/bundle'
const optionsWithBundlerVersion = {options: {env: {...process.env, BUNDLER_VERSION: bundlerVersion}}}
await exec.exec('bundle', ['config', '--local', 'path', path], optionsWithBundlerVersion) await exec.exec('bundle', ['config', '--local', 'path', path], optionsWithBundlerVersion)
index.js
+3 -1
View File
@@ -240,9 +240,11 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b
return false return false
} }
// Before the lockfile exists, we need to specify which Bundler version to use explicitly
const optionsWithBundlerVersion = { env: { ...process.env, BUNDLER_VERSION: bundlerVersion } }
// config // config
const path = 'vendor/bundle' const path = 'vendor/bundle'
const optionsWithBundlerVersion = {options: {env: {...process.env, BUNDLER_VERSION: bundlerVersion}}}
await exec.exec('bundle', ['config', '--local', 'path', path], optionsWithBundlerVersion) await exec.exec('bundle', ['config', '--local', 'path', path], optionsWithBundlerVersion)
windows.js
+1 -1
View File
@@ -68,7 +68,7 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
}) })
await common.measure('Extracting Ruby', async () => await common.measure('Extracting Ruby', async () =>
exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${parentDir}`], {silent: true})) exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${parentDir}`], { silent: true }))
if (base !== path.basename(rubyPrefix)) { if (base !== path.basename(rubyPrefix)) {
await io.mv(path.join(parentDir, base), rubyPrefix) await io.mv(path.join(parentDir, base), rubyPrefix)