Use the shipped Bundler on TruffleRuby 22.0

* To workaround https://github.com/oracle/truffleruby/issues/2586

README.md

@@ -15,9 +15,9 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 | Interpreter | Versions |
 | ----------- | -------- |
 | `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.1.0, head, debug, mingw, mswin |
-| `jruby` | 9.1.17.0 - 9.3.2.0, head |
-| `truffleruby` | 19.3.0 - 21.3.0, head |
-| `truffleruby+graalvm` | 21.2.0 - 21.3.0, head |
+| `jruby` | 9.1.17.0 - 9.3.3.0, head |
+| `truffleruby` | 19.3.0 - 22.0.0, head |
+| `truffleruby+graalvm` | 21.2.0 - 22.0.0, head |
 
 `ruby-debug` is the same as `ruby-head` but with assertions enabled (`-DRUBY_DEBUG=1`).  
 On Windows, `mingw` and `mswin` are `ruby-head` builds using the MSYS2/MinGW and the MSVC toolchains respectively.

bundler.js

@@ -71,7 +71,9 @@ export async function installBundler(bundlerVersionInput, lockFile, platform, ru
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
   }
 
-  if (engine === 'ruby' && common.floatVersion(rubyVersion) <= 2.2) {
+  const floatVersion = common.floatVersion(rubyVersion)
+
+  if (engine === 'ruby' && floatVersion <= 2.2) {
     console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2')
     bundlerVersion = '1'
   } else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) {
@@ -82,7 +84,10 @@ export async function installBundler(bundlerVersionInput, lockFile, platform, ru
     bundlerVersion = '1'
   }
 
-  if (common.isHeadVersion(rubyVersion) && common.isBundler2Default(engine, rubyVersion) && bundlerVersion.startsWith('2')) {
+  // Workaround for truffleruby 22.0 + latest Bundler, use shipped Bundler instead: https://github.com/oracle/truffleruby/issues/2586
+  const useShippedBundler2 = common.isHeadVersion(rubyVersion) || (engine.startsWith('truffleruby') && rubyVersion.startsWith('22.0'))
+
+  if (useShippedBundler2 && common.isBundler2Default(engine, rubyVersion) && bundlerVersion.startsWith('2')) {
     // Avoid installing a newer Bundler version for head versions as it might not work.
     // For releases, even if they ship with Bundler 2 we install the latest Bundler.
     console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
@@ -92,7 +97,7 @@ export async function installBundler(bundlerVersionInput, lockFile, platform, ru
     const gem = path.join(rubyPrefix, 'bin', 'gem')
     const bundlerVersionConstraint = /^\d+\.\d+\.\d+/.test(bundlerVersion) ? bundlerVersion : `~> ${bundlerVersion}`
     // Workaround for https://github.com/rubygems/rubygems/issues/5245
-    const force = (platform.startsWith('windows-') && engine === 'ruby' && common.floatVersion(rubyVersion) >= 3.1) ? ['--force'] : []
+    const force = (platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) ? ['--force'] : []
     await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint])
   }
 

dist/index.js

@@ -85,7 +85,9 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
   }
 
-  if (engine === 'ruby' && common.floatVersion(rubyVersion) <= 2.2) {
+  const floatVersion = common.floatVersion(rubyVersion)
+
+  if (engine === 'ruby' && floatVersion <= 2.2) {
     console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2')
     bundlerVersion = '1'
   } else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) {
@@ -96,7 +98,10 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi
     bundlerVersion = '1'
   }
 
-  if (common.isHeadVersion(rubyVersion) && common.isBundler2Default(engine, rubyVersion) && bundlerVersion.startsWith('2')) {
+  // Workaround for truffleruby 22.0 + latest Bundler, use shipped Bundler instead: https://github.com/oracle/truffleruby/issues/2586
+  const useShippedBundler2 = common.isHeadVersion(rubyVersion) || (engine.startsWith('truffleruby') && rubyVersion.startsWith('22.0'))
+
+  if (useShippedBundler2 && common.isBundler2Default(engine, rubyVersion) && bundlerVersion.startsWith('2')) {
     // Avoid installing a newer Bundler version for head versions as it might not work.
     // For releases, even if they ship with Bundler 2 we install the latest Bundler.
     console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
@@ -106,7 +111,7 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi
     const gem = path.join(rubyPrefix, 'bin', 'gem')
     const bundlerVersionConstraint = /^\d+\.\d+\.\d+/.test(bundlerVersion) ? bundlerVersion : `~> ${bundlerVersion}`
     // Workaround for https://github.com/rubygems/rubygems/issues/5245
-    const force = (platform.startsWith('windows-') && engine === 'ruby' && common.floatVersion(rubyVersion) >= 3.1) ? ['--force'] : []
+    const force = (platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) ? ['--force'] : []
     await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint])
   }
 
@@ -59263,7 +59268,7 @@ module.exports = JSON.parse('["ac","com.ac","edu.ac","gov.ac","net.ac","mil.ac",
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"ruby":["1.9.3-p551","2.0.0-p648","2.1.9","2.2.10","2.3.0","2.3.1","2.3.2","2.3.3","2.3.4","2.3.5","2.3.6","2.3.7","2.3.8","2.4.0","2.4.1","2.4.2","2.4.3","2.4.4","2.4.5","2.4.6","2.4.7","2.4.9","2.4.10","2.5.0","2.5.1","2.5.2","2.5.3","2.5.4","2.5.5","2.5.6","2.5.7","2.5.8","2.5.9","2.6.0","2.6.1","2.6.2","2.6.3","2.6.4","2.6.5","2.6.6","2.6.7","2.6.8","2.6.9","2.7.0","2.7.1","2.7.2","2.7.3","2.7.4","2.7.5","3.0.0-preview1","3.0.0-preview2","3.0.0-rc1","3.0.0","3.0.1","3.0.2","3.0.3","3.1.0-preview1","3.1.0","head","debug"],"jruby":["9.1.17.0","9.2.9.0","9.2.10.0","9.2.11.0","9.2.11.1","9.2.12.0","9.2.13.0","9.2.14.0","9.2.15.0","9.2.16.0","9.2.17.0","9.2.18.0","9.2.19.0","9.2.20.0","9.2.20.1","9.3.0.0","9.3.1.0","9.3.2.0","9.3.3.0","head"],"truffleruby":["19.3.0","19.3.1","20.0.0","20.1.0","20.2.0","20.3.0","21.0.0","21.1.0","21.2.0","21.2.0.1","21.3.0","head"],"truffleruby+graalvm":["21.2.0","21.3.0","head"]}');
+module.exports = JSON.parse('{"ruby":["1.9.3-p551","2.0.0-p648","2.1.9","2.2.10","2.3.0","2.3.1","2.3.2","2.3.3","2.3.4","2.3.5","2.3.6","2.3.7","2.3.8","2.4.0","2.4.1","2.4.2","2.4.3","2.4.4","2.4.5","2.4.6","2.4.7","2.4.9","2.4.10","2.5.0","2.5.1","2.5.2","2.5.3","2.5.4","2.5.5","2.5.6","2.5.7","2.5.8","2.5.9","2.6.0","2.6.1","2.6.2","2.6.3","2.6.4","2.6.5","2.6.6","2.6.7","2.6.8","2.6.9","2.7.0","2.7.1","2.7.2","2.7.3","2.7.4","2.7.5","3.0.0-preview1","3.0.0-preview2","3.0.0-rc1","3.0.0","3.0.1","3.0.2","3.0.3","3.1.0-preview1","3.1.0","head","debug"],"jruby":["9.1.17.0","9.2.9.0","9.2.10.0","9.2.11.0","9.2.11.1","9.2.12.0","9.2.13.0","9.2.14.0","9.2.15.0","9.2.16.0","9.2.17.0","9.2.18.0","9.2.19.0","9.2.20.0","9.2.20.1","9.3.0.0","9.3.1.0","9.3.2.0","9.3.3.0","head"],"truffleruby":["19.3.0","19.3.1","20.0.0","20.1.0","20.2.0","20.3.0","21.0.0","21.1.0","21.2.0","21.2.0.1","21.3.0","22.0.0.2","head"],"truffleruby+graalvm":["21.2.0","21.3.0","22.0.0.2","head"]}');
 
 /***/ }),
 
@@ -59590,16 +59595,17 @@ async function setupRuby(options = {}) {
     await inputs['afterSetupPathHook']({ platform, rubyPrefix, engine, version })
   }
 
+  const [gemfile, lockFile] = bundler.detectGemfiles()
+  let bundlerVersion = "unknown"
+
   if (inputs['bundler'] !== 'none') {
-    const [gemfile, lockFile] = bundler.detectGemfiles()
-
-    const bundlerVersion = await common.measure('Installing Bundler', async () =>
+    bundlerVersion = await common.measure('Installing Bundler', async () =>
       bundler.installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
+  }
 
-    if (inputs['bundler-cache'] === 'true') {
-      await common.measure('bundle install', async () =>
-        bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
-    }
+  if (inputs['bundler-cache'] === 'true') {
+    await common.measure('bundle install', async () =>
+      bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
   }
 
   core.setOutput('ruby-prefix', rubyPrefix)

index.js

@@ -78,16 +78,17 @@ export async function setupRuby(options = {}) {
     await inputs['afterSetupPathHook']({ platform, rubyPrefix, engine, version })
   }
 
+  const [gemfile, lockFile] = bundler.detectGemfiles()
+  let bundlerVersion = "unknown"
+
   if (inputs['bundler'] !== 'none') {
-    const [gemfile, lockFile] = bundler.detectGemfiles()
-
-    const bundlerVersion = await common.measure('Installing Bundler', async () =>
+    bundlerVersion = await common.measure('Installing Bundler', async () =>
       bundler.installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
+  }
 
-    if (inputs['bundler-cache'] === 'true') {
-      await common.measure('bundle install', async () =>
-        bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
-    }
+  if (inputs['bundler-cache'] === 'true') {
+    await common.measure('bundle install', async () =>
+      bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
   }
 
   core.setOutput('ruby-prefix', rubyPrefix)

new-version.rb

@@ -1,6 +1,6 @@
-engine, version = ARGV.fetch(0).split('-', 2)
+engine_input, version = ARGV.fetch(0).split('-', 2)
 
-MATCH = case engine
+MATCH = case engine_input
 when 'ruby', 'jruby'
   /^\d+\.\d+\./
 when 'truffleruby'
@@ -9,26 +9,49 @@ end
 
 raise unless version[MATCH]
 
-file = "#{__dir__}/ruby-builder-versions.json"
-lines = File.readlines(file, chomp: true)
+engines = [engine_input]
+engines << 'truffleruby+graalvm' if engine_input == 'truffleruby'
 
-from = lines.index { |line| line =~ /"#{engine}": \[/ }
-to = from
-to += 1 until lines[to].include?(']')
+engines.each do |engine|
+  puts engine
 
-from += 1 # [
-to -= 2 # head, ]
+  # Update ruby-builder-versions.json
+  file = "#{__dir__}/ruby-builder-versions.json"
+  lines = File.readlines(file, chomp: true)
 
-puts lines[from..to]
+  from = lines.index { |line| line.include?(%{"#{engine}": [}) }
+  raise "Could not find start of #{engine}" unless from
+  to = from
+  to += 1 until lines[to].include?(']')
 
-release_line = lines[from..to].find { |line|
-  v = line[/"([^"]+)"/, 1] and v[MATCH] == version[MATCH]
-}
+  from += 1 # [
+  to -= 2 # head, ]
 
-if release_line
-  release_line << " #{version.inspect},"
-else
-  lines.insert to+1, "    #{version.inspect},"
+  puts lines[from..to]
+
+  release_line = lines[from..to].find { |line|
+    v = line[/"([^"]+)"/, 1] and v[MATCH] == version[MATCH]
+  }
+
+  if release_line
+    append = " #{version.inspect},"
+    release_line << append unless release_line.end_with?(append)
+  else
+    lines.insert to+1, "    #{version.inspect},"
+  end
+
+  File.write(file, lines.join("\n") + "\n")
+
+  # Update README.md
+  file = "#{__dir__}/README.md"
+  lines = File.readlines(file)
+  engine_line = lines.find { |line| line.start_with?("| `#{engine}`") }
+  engine_line.sub!(/(.+ (?:-|until)) (\d+(?:\.\d+)+)/) do
+    if Gem::Version.new(version) > Gem::Version.new($2)
+      "#{$1} #{version}"
+    else
+      $&
+    end
+  end
+  File.write(file, lines.join)
 end
-
-File.write(file, lines.join("\n") + "\n")

ruby-builder-versions.json

@@ -23,10 +23,12 @@
     "19.3.0", "19.3.1",
     "20.0.0", "20.1.0", "20.2.0", "20.3.0",
     "21.0.0", "21.1.0", "21.2.0", "21.2.0.1", "21.3.0",
+    "22.0.0.2",
     "head"
   ],
   "truffleruby+graalvm": [
     "21.2.0", "21.3.0",
+    "22.0.0.2",
     "head"
   ]
 }