Add jruby-9.3.10.0

* This reverts commit 3190662165.
* It causes other issues such as https://github.com/ruby/setup-ruby/issues/444
  due to creating additional global state.
* The use-case it solves is too niche to risk such issues,
  using `bundler-cache: true` avoids the problem.
* See https://github.com/ruby/setup-ruby/issues/444#issuecomment-1377723414

.github/workflows/test.yml

@@ -18,7 +18,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-10.15, macos-11, macos-12, windows-2019, windows-2022 ]
-        ruby: [ '1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', ruby-head, jruby, jruby-head, truffleruby, truffleruby-head, truffleruby+graalvm, truffleruby+graalvm-head ]
+        ruby: [
+          '1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', ruby-head,
+          jruby, jruby-head,
+          truffleruby, truffleruby-head,
+          truffleruby+graalvm, truffleruby+graalvm-head
+        ]
         include:
         - { os: windows-2019, ruby: mingw }
         - { os: windows-2019, ruby: mswin }
@@ -239,6 +244,17 @@ jobs:
         bundler: 2.2.3
     - run: bundle --version | grep -F "Bundler version 2.2.3"
 
+  testBundlerPre:
+    name: "Test with a Bundler pre/rc version"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./
+        with:
+          ruby-version: '2.6'
+          bundler: 2.2.0.rc.2
+      - run: bundle --version | grep -F "Bundler version 2.2.0.rc.2"
+
   testBundlerDev:
     name: "Test BUNDLED WITH Bundler dev"
     runs-on: ubuntu-latest

README.md

@@ -17,8 +17,8 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 | ----------- | -------- |
 | `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.2.0, head, debug, mingw, mswin, ucrt |
 | `jruby` | 9.1.17.0 - 9.4.0.0, head |
-| `truffleruby` | 19.3.0 - 22.3.0, head |
-| `truffleruby+graalvm` | 21.2.0 - 22.3.0, head |
+| `truffleruby` | 19.3.0 - 22.3.1, head |
+| `truffleruby+graalvm` | 21.2.0 - 22.3.1, head |
 
 `ruby-debug` is the same as `ruby-head` but with assertions enabled (`-DRUBY_DEBUG=1`).  
 

bundler.js

@@ -6,7 +6,10 @@ const cache = require('@actions/cache')
 const common = require('./common')
 
 export const DEFAULT_CACHE_VERSION = '0'
-export const BUNDLER_VERSION_REGEXP = /^\d+(?:\.\d+){0,2}$/
+
+function isValidBundlerVersion(bundlerVersion) {
+  return /^\d+(?:\.\d+){0,2}/.test(bundlerVersion) && !bundlerVersion.endsWith('.dev')
+}
 
 // The returned gemfile is guaranteed to exist, the lockfile might not exist
 export function detectGemfiles() {
@@ -33,7 +36,7 @@ function readBundledWithFromGemfileLock(lockFile) {
       const nextLine = lines[bundledWithLine+1]
       if (nextLine) {
         const bundlerVersion = nextLine.trim()
-        if (BUNDLER_VERSION_REGEXP.test(bundlerVersion)) {
+        if (isValidBundlerVersion(bundlerVersion)) {
           console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
           return bundlerVersion
         } else {
@@ -100,7 +103,7 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     bundlerVersion = '2'
   }
 
-  if (BUNDLER_VERSION_REGEXP.test(bundlerVersion)) {
+  if (isValidBundlerVersion(bundlerVersion)) {
     // OK - input is a 1, 2, or 3 part version number
   } else {
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
@@ -139,7 +142,7 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
   const force = ((platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) || (engine === 'truffleruby')) ? ['--force'] : []
 
   const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
-  const bundlerVersionConstraint = versionParts === 3 ? bundlerVersion : `~> ${bundlerVersion}.0`
+  const bundlerVersionConstraint = versionParts >= 3 ? bundlerVersion : `~> ${bundlerVersion}.0`
 
   await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint])
 

dist/index.js

@@ -8,7 +8,6 @@
 __nccwpck_require__.r(__webpack_exports__);
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   "DEFAULT_CACHE_VERSION": () => (/* binding */ DEFAULT_CACHE_VERSION),
-/* harmony export */   "BUNDLER_VERSION_REGEXP": () => (/* binding */ BUNDLER_VERSION_REGEXP),
 /* harmony export */   "detectGemfiles": () => (/* binding */ detectGemfiles),
 /* harmony export */   "installBundler": () => (/* binding */ installBundler),
 /* harmony export */   "bundleInstall": () => (/* binding */ bundleInstall)
@@ -21,7 +20,10 @@ const cache = __nccwpck_require__(7799)
 const common = __nccwpck_require__(4717)
 
 const DEFAULT_CACHE_VERSION = '0'
-const BUNDLER_VERSION_REGEXP = /^\d+(?:\.\d+){0,2}$/
+
+function isValidBundlerVersion(bundlerVersion) {
+  return /^\d+(?:\.\d+){0,2}/.test(bundlerVersion) && !bundlerVersion.endsWith('.dev')
+}
 
 // The returned gemfile is guaranteed to exist, the lockfile might not exist
 function detectGemfiles() {
@@ -48,7 +50,7 @@ function readBundledWithFromGemfileLock(lockFile) {
       const nextLine = lines[bundledWithLine+1]
       if (nextLine) {
         const bundlerVersion = nextLine.trim()
-        if (BUNDLER_VERSION_REGEXP.test(bundlerVersion)) {
+        if (isValidBundlerVersion(bundlerVersion)) {
           console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
           return bundlerVersion
         } else {
@@ -115,7 +117,7 @@ async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, p
     bundlerVersion = '2'
   }
 
-  if (BUNDLER_VERSION_REGEXP.test(bundlerVersion)) {
+  if (isValidBundlerVersion(bundlerVersion)) {
     // OK - input is a 1, 2, or 3 part version number
   } else {
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
@@ -154,7 +156,7 @@ async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, p
   const force = ((platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) || (engine === 'truffleruby')) ? ['--force'] : []
 
   const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
-  const bundlerVersionConstraint = versionParts === 3 ? bundlerVersion : `~> ${bundlerVersion}.0`
+  const bundlerVersionConstraint = versionParts >= 3 ? bundlerVersion : `~> ${bundlerVersion}.0`
 
   await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint])
 
@@ -68236,10 +68238,11 @@ async function installGCCTools(type, version) {
   // 2022-Dec ruby/msys2-gcc-pkgs now uses a suffix to delineate different archive versions.
   // At present, the only use is to indicate the included OpenSSL version.
   // With no suffix, archives include OpenSSL 1.1.1, with a '-3.0' suffix, they include
-  // OpenSSL 3.0.x.
-  // Currently, OpenSSL 3 is used in Ruby 3.2 & 'head', both use a custom RubyInstaller2 package.
+  // OpenSSL 3.0.x.  Note that the mswin archive uses OpenSSL 3. 
+  // As of Jan-2023, OpenSSL 3 is used in Ruby 3.2 & all head versions.  MSYS2 updated
+  // to OpenSSL 3 on 14-Jan-2023.
   let suffix = ''
-  if ((version === 'head') || (!common.isHeadVersion(version) && common.floatVersion(version) >= 3.2)) {
+  if (common.isHeadVersion(version) || common.floatVersion(version) >= 3.2) {
     suffix = '-3.0'
   }
   const downloadPath = await common.measure(`Downloading ${type}${suffix} build tools`, async () => {
@@ -68638,7 +68641,7 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
 /***/ ((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.6.10","2.7.0","2.7.1","2.7.2","2.7.3","2.7.4","2.7.5","2.7.6","2.7.7","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.0.4","3.0.5","3.1.0-preview1","3.1.0","3.1.1","3.1.2","3.1.3","3.2.0-preview1","3.2.0-preview2","3.2.0-preview3","3.2.0-rc1","3.2.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.2.21.0","9.3.0.0","9.3.1.0","9.3.2.0","9.3.3.0","9.3.4.0","9.3.6.0","9.3.7.0","9.3.8.0","9.3.9.0","9.4.0.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","22.1.0","22.2.0","22.3.0","head"],"truffleruby+graalvm":["21.2.0","21.3.0","22.0.0.2","22.1.0","22.2.0","22.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.6.10","2.7.0","2.7.1","2.7.2","2.7.3","2.7.4","2.7.5","2.7.6","2.7.7","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.0.4","3.0.5","3.1.0-preview1","3.1.0","3.1.1","3.1.2","3.1.3","3.2.0-preview1","3.2.0-preview2","3.2.0-preview3","3.2.0-rc1","3.2.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.2.21.0","9.3.0.0","9.3.1.0","9.3.2.0","9.3.3.0","9.3.4.0","9.3.6.0","9.3.7.0","9.3.8.0","9.3.9.0","9.3.10.0","9.4.0.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","22.1.0","22.2.0","22.3.0","22.3.1","head"],"truffleruby+graalvm":["21.2.0","21.3.0","22.0.0.2","22.1.0","22.2.0","22.3.0","22.3.1","head"]}');
 
 /***/ }),
 

new-versions.rb

@@ -1,65 +1,62 @@
 versions = ARGV.fetch(0).split(',').map(&:strip)
-versions.each do |engine_version|
-  engine_input, version = engine_version.split('-', 2)
+p versions
 
-  if engine_input == 'windows'
+versions.each do |engine_version|
+  puts engine_version
+  engine, version = engine_version.split('-', 2)
+  p [engine, version]
+
+  if engine == 'windows'
     require_relative 'generate-windows-versions'
     exit
   end
 
-  MATCH = case engine_input
+  match = case engine
   when 'ruby', 'jruby'
     /^\d+\.\d+\./
-  when 'truffleruby'
+  when 'truffleruby', 'truffleruby+graalvm'
     /^\d+\./
   end
 
-  raise unless version[MATCH]
+  raise engine_version unless version[match]
 
-  engines = [engine_input]
-  engines << 'truffleruby+graalvm' if engine_input == 'truffleruby'
+  # Update ruby-builder-versions.json
+  file = "#{__dir__}/ruby-builder-versions.json"
+  lines = File.readlines(file, chomp: true)
 
-  engines.each do |engine|
-    puts engine
+  from = lines.index { |line| line.include?(%{"#{engine}": [}) }
+  raise "Could not find start of #{engine}" unless from
+  to = from
+  to += 1 until lines[to].include?(']')
 
-    # Update ruby-builder-versions.json
-    file = "#{__dir__}/ruby-builder-versions.json"
-    lines = File.readlines(file, chomp: true)
+  from += 1 # [
+  to -= 2 # head, ]
 
-    from = lines.index { |line| line.include?(%{"#{engine}": [}) }
-    raise "Could not find start of #{engine}" unless from
-    to = from
-    to += 1 until lines[to].include?(']')
+  puts lines[from..to]
 
-    from += 1 # [
-    to -= 2 # head, ]
+  release_line = lines[from..to].find { |line|
+    v = line[/"([^"]+)"/, 1] and v[match] == version[match]
+  }
 
-    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+)+(?:-\w+)?)/) do
-      if Gem::Version.new(version) > Gem::Version.new($2)
-        "#{$1} #{version}"
-      else
-        $&
-      end
-    end
-    File.write(file, lines.join)
+  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+)+(?:-\w+)?)/) do
+    if Gem::Version.new(version) > Gem::Version.new($2)
+      "#{$1} #{version}"
+    else
+      $&
+    end
+  end
+  File.write(file, lines.join)
 end

ruby-builder-versions.json

@@ -17,7 +17,7 @@
   "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.2.21.0",
-    "9.3.0.0", "9.3.1.0", "9.3.2.0", "9.3.3.0", "9.3.4.0", "9.3.6.0", "9.3.7.0", "9.3.8.0", "9.3.9.0",
+    "9.3.0.0", "9.3.1.0", "9.3.2.0", "9.3.3.0", "9.3.4.0", "9.3.6.0", "9.3.7.0", "9.3.8.0", "9.3.9.0", "9.3.10.0",
     "9.4.0.0",
     "head"
   ],
@@ -25,12 +25,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", "22.1.0", "22.2.0", "22.3.0",
+    "22.0.0.2", "22.1.0", "22.2.0", "22.3.0", "22.3.1",
     "head"
   ],
   "truffleruby+graalvm": [
     "21.2.0", "21.3.0",
-    "22.0.0.2", "22.1.0", "22.2.0", "22.3.0",
+    "22.0.0.2", "22.1.0", "22.2.0", "22.3.0", "22.3.1",
     "head"
   ]
 }

windows.js

@@ -103,10 +103,11 @@ async function installGCCTools(type, version) {
   // 2022-Dec ruby/msys2-gcc-pkgs now uses a suffix to delineate different archive versions.
   // At present, the only use is to indicate the included OpenSSL version.
   // With no suffix, archives include OpenSSL 1.1.1, with a '-3.0' suffix, they include
-  // OpenSSL 3.0.x.
-  // Currently, OpenSSL 3 is used in Ruby 3.2 & 'head', both use a custom RubyInstaller2 package.
+  // OpenSSL 3.0.x.  Note that the mswin archive uses OpenSSL 3. 
+  // As of Jan-2023, OpenSSL 3 is used in Ruby 3.2 & all head versions.  MSYS2 updated
+  // to OpenSSL 3 on 14-Jan-2023.
   let suffix = ''
-  if ((version === 'head') || (!common.isHeadVersion(version) && common.floatVersion(version) >= 3.2)) {
+  if (common.isHeadVersion(version) || common.floatVersion(version) >= 3.2) {
     suffix = '-3.0'
   }
   const downloadPath = await common.measure(`Downloading ${type}${suffix} build tools`, async () => {