From 7fc726bf023228cdfc1ca609bf833340da67acf0 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Sun, 25 Dec 2022 06:19:58 +0900 Subject: [PATCH] Bundler-2.4 requires Ruby 2.6 or later. --- bundler.js | 4 ++++ dist/index.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/bundler.js b/bundler.js index de07623e1..9a5fd0cba 100644 --- a/bundler.js +++ b/bundler.js @@ -107,6 +107,7 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock } // Use Bundler 1 when we know Bundler 2 does not work + // Use Bundler 2.3 when we use Ruby 2.3.2-2.5 if (bundlerVersion.startsWith('2')) { if (engine === 'ruby' && floatVersion <= 2.2) { console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2') @@ -114,6 +115,9 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock } else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) { console.log('Ruby 2.3.0 and 2.3.1 have shipped with an old rubygems that only works with Bundler 1') bundlerVersion = '1' + } else if (engine === 'ruby' && floatVersion <= 2.5) { + console.log('Ruby 2.3.2-2.5 only works with Bundler 2.3') + bundlerVersion = '2.3' } else if (engine === 'jruby' && rubyVersion.startsWith('9.1')) { // JRuby 9.1 targets Ruby 2.3, treat it the same console.log('JRuby 9.1 has a bug with Bundler 2 (https://github.com/ruby/setup-ruby/issues/108), using Bundler 1 instead on JRuby 9.1') bundlerVersion = '1' diff --git a/dist/index.js b/dist/index.js index cae25ed7b..e34fe6d25 100644 --- a/dist/index.js +++ b/dist/index.js @@ -122,6 +122,7 @@ async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, p } // Use Bundler 1 when we know Bundler 2 does not work + // Use Bundler 2.3 when we use Ruby 2.3.2-2.5 if (bundlerVersion.startsWith('2')) { if (engine === 'ruby' && floatVersion <= 2.2) { console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2') @@ -129,6 +130,9 @@ async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, p } else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) { console.log('Ruby 2.3.0 and 2.3.1 have shipped with an old rubygems that only works with Bundler 1') bundlerVersion = '1' + } else if (engine === 'ruby' && floatVersion <= 2.5) { + console.log('Ruby 2.3.2-2.5 only works with Bundler 2.3') + bundlerVersion = '2.3' } else if (engine === 'jruby' && rubyVersion.startsWith('9.1')) { // JRuby 9.1 targets Ruby 2.3, treat it the same console.log('JRuby 9.1 has a bug with Bundler 2 (https://github.com/ruby/setup-ruby/issues/108), using Bundler 1 instead on JRuby 9.1') bundlerVersion = '1'