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

Pass selected Bundler version to bundle config & bundle lock

Browse Source
This commit is contained in:
ojab
2020-12-07 21:06:26 +01:00
committed by Benoit Daloze
parent d3562e70d9
commit cadade3366
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+9 -8
View File
@@ -51257,12 +51257,12 @@ async function setupRuby(options = {}) {
if (inputs['bundler'] !== 'none') {
const [gemfile, lockFile] = detectGemfiles()
await common.measure('Installing Bundler', async () =>
const bundlerVersion = await common.measure('Installing Bundler', async () =>
installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
if (inputs['bundler-cache'] === 'true') {
await common.measure('bundle install', async () =>
bundleInstall(gemfile, lockFile, platform, engine, version))
bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion))
}
}
@@ -51425,10 +51425,10 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi
await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document'])
}
core.exportVariable('BUNDLER_VERSION', bundlerVersion)
return bundlerVersion
}
async function bundleInstall(gemfile, lockFile, platform, engine, version) {
async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, bundlerVersion) {
if (gemfile === null) {
console.log('Could not determine gemfile path, skipping "bundle install" and caching')
return false
@@ -51436,20 +51436,21 @@ async function bundleInstall(gemfile, lockFile, platform, engine, version) {
// config
const path = 'vendor/bundle'
const optionsWithBundlerVersion = {options: {env: {...process.env, BUNDLER_VERSION: bundlerVersion}}}
await exec.exec('bundle', ['config', '--local', 'path', path])
await exec.exec('bundle', ['config', '--local', 'path', path], optionsWithBundlerVersion)
if (fs.existsSync(lockFile)) {
await exec.exec('bundle', ['config', '--local', 'deployment', 'true'])
await exec.exec('bundle', ['config', '--local', 'deployment', 'true'], optionsWithBundlerVersion)
} else {
// Generate the lockfile so we can use it to compute the cache key.
// This will also automatically pick up the latest gem versions compatible with the Gemfile.
await exec.exec('bundle', ['lock'])
await exec.exec('bundle', ['lock'], optionsWithBundlerVersion)
}
// cache key
const paths = [path]
const baseKey = await computeBaseKey(platform, engine, version, lockFile)
const baseKey = await computeBaseKey(platform, engine, rubyVersion, lockFile)
const key = `${baseKey}-${await common.hashFile(lockFile)}`
// If only Gemfile.lock changes we can reuse part of the cache, and clean old gem versions below
const restoreKeys = [`${baseKey}-`]
index.js
+9 -8
View File
@@ -63,12 +63,12 @@ export async function setupRuby(options = {}) {
if (inputs['bundler'] !== 'none') {
const [gemfile, lockFile] = detectGemfiles()
await common.measure('Installing Bundler', async () =>
const bundlerVersion = await common.measure('Installing Bundler', async () =>
installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
if (inputs['bundler-cache'] === 'true') {
await common.measure('bundle install', async () =>
bundleInstall(gemfile, lockFile, platform, engine, version))
bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion))
}
}
@@ -231,10 +231,10 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi
await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document'])
}
core.exportVariable('BUNDLER_VERSION', bundlerVersion)
return bundlerVersion
}
async function bundleInstall(gemfile, lockFile, platform, engine, version) {
async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, bundlerVersion) {
if (gemfile === null) {
console.log('Could not determine gemfile path, skipping "bundle install" and caching')
return false
@@ -242,20 +242,21 @@ async function bundleInstall(gemfile, lockFile, platform, engine, version) {
// config
const path = 'vendor/bundle'
const optionsWithBundlerVersion = {options: {env: {...process.env, BUNDLER_VERSION: bundlerVersion}}}
await exec.exec('bundle', ['config', '--local', 'path', path])
await exec.exec('bundle', ['config', '--local', 'path', path], optionsWithBundlerVersion)
if (fs.existsSync(lockFile)) {
await exec.exec('bundle', ['config', '--local', 'deployment', 'true'])
await exec.exec('bundle', ['config', '--local', 'deployment', 'true'], optionsWithBundlerVersion)
} else {
// Generate the lockfile so we can use it to compute the cache key.
// This will also automatically pick up the latest gem versions compatible with the Gemfile.
await exec.exec('bundle', ['lock'])
await exec.exec('bundle', ['lock'], optionsWithBundlerVersion)
}
// cache key
const paths = [path]
const baseKey = await computeBaseKey(platform, engine, version, lockFile)
const baseKey = await computeBaseKey(platform, engine, rubyVersion, lockFile)
const key = `${baseKey}-${await common.hashFile(lockFile)}`
// If only Gemfile.lock changes we can reuse part of the cache, and clean old gem versions below
const restoreKeys = [`${baseKey}-`]