diff --git a/README.md b/README.md index 5bae43f2a..c673e4576 100644 --- a/README.md +++ b/README.md @@ -163,5 +163,5 @@ Please [update](https://github.com/ruby/setup-ruby/releases/tag/v1.13.0) if you ## Credits The current maintainer of this action is @eregon. -Most of the Windows logic is from https://github.com/MSP-Greg/actions-ruby by MSP-Greg. +Most of the Windows logic is based on work by MSP-Greg. Many thanks to MSP-Greg and Lars Kanis for the help with Ruby Installer. diff --git a/dist/index.js b/dist/index.js index 0e1c852cb..8e1b0b4b9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1107,7 +1107,7 @@ async function installBundler(platform, rubyPrefix, engine, rubyVersion) { } else if (/^\d+/.test(bundlerVersion)) { versionArray = ['-v', `~> ${bundlerVersion}`] } else if (bundlerVersion === 'latest') { - versionArray = [] + versionArray = ['-v', '>= 2.1'] } else { throw new Error(`Cannot parse bundler input: ${bundlerVersion}`) } @@ -1117,7 +1117,7 @@ async function installBundler(platform, rubyPrefix, engine, rubyVersion) { } else if (bundlerVersion === '1' && engine === 'truffleruby') { console.log(`Using the Bundler version shipped with ${engine}`) } else { - await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', ...versionArray, '--no-document']) + await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', ...versionArray, '--no-document', '--conservative']) } } diff --git a/index.js b/index.js index ac8cb7fae..5c198feb7 100644 --- a/index.js +++ b/index.js @@ -149,7 +149,7 @@ async function installBundler(platform, rubyPrefix, engine, rubyVersion) { } else if (/^\d+/.test(bundlerVersion)) { versionArray = ['-v', `~> ${bundlerVersion}`] } else if (bundlerVersion === 'latest') { - versionArray = [] + versionArray = ['-v', '>= 2.1'] } else { throw new Error(`Cannot parse bundler input: ${bundlerVersion}`) } @@ -159,7 +159,7 @@ async function installBundler(platform, rubyPrefix, engine, rubyVersion) { } else if (bundlerVersion === '1' && engine === 'truffleruby') { console.log(`Using the Bundler version shipped with ${engine}`) } else { - await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', ...versionArray, '--no-document']) + await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', ...versionArray, '--no-document', '--conservative']) } }