Fix automatic bundler installation on JRuby 9.2

* No need to duplicate docs about which is *-latest here.

.github/workflows/test.yml

@@ -18,7 +18,7 @@ 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', 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 }
@@ -27,12 +27,14 @@ jobs:
         - { os: windows-2022, ruby: ucrt  }
         exclude:
         - { os: windows-2019, ruby: '1.9' }
+        - { os: windows-2019, ruby: '3.2' }
         - { os: windows-2019, ruby: debug }
         - { os: windows-2019, ruby: truffleruby }
         - { os: windows-2019, ruby: truffleruby-head }
         - { os: windows-2019, ruby: truffleruby+graalvm }
         - { os: windows-2019, ruby: truffleruby+graalvm-head }
         - { os: windows-2022, ruby: '1.9' }
+        - { os: windows-2022, ruby: '3.2' }
         - { os: windows-2022, ruby: debug }
         - { os: windows-2022, ruby: truffleruby }
         - { os: windows-2022, ruby: truffleruby-head }
@@ -184,6 +186,7 @@ jobs:
     - run: gem --version | grep -F "3.3.3"
 
   testUseBundlerFromRubyGemsUpdate:
+    if: false # https://github.com/ruby/setup-ruby/issues/405
     name: "Test rubygems: version uses the Bundler installed by the rubygems update"
     runs-on: ubuntu-latest
     steps:
@@ -239,6 +242,18 @@ jobs:
         bundler: 2.2.3
     - run: bundle --version | grep -F "Bundler version 2.2.3"
 
+  testBundlerDev:
+    name: "Test BUNDLED WITH Bundler dev"
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler-dev.gemfile
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./
+        with:
+          ruby-version: ruby-head
+          bundler-cache: true
+
   testDependencyOnBundler1:
     name: "Test gemfile depending on Bundler 1"
     runs-on: ubuntu-latest

README.md

@@ -15,8 +15,8 @@ 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.2.0-preview1, head, debug, mingw, mswin, ucrt |
-| `jruby` | 9.1.17.0 - 9.3.9.0, head |
+| `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 |
 
@@ -38,13 +38,13 @@ which means Ruby ≤ 2.4 is unmaintained and considered insecure.
 
 ### Supported Platforms
 
-The action works on these [GitHub-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners) virtual environments. Virtual environments not listed below are unsupported.
+The action works on these [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) images. Runner images not listed below are not supported yet. `$OS-latest` just alias to one of these images.
 
-| Operating System | Recommended | Other Supported Versions |
-| ---------------- | ----------- | ------------------------ |
-| Ubuntu  | `ubuntu-latest` (= `ubuntu-20.04`)  | `ubuntu-18.04`, `ubuntu-22.04` |
-| macOS   | `macos-latest` (= `macos-11`)       | `macos-10.15`, `macos-12` |
-| Windows | `windows-latest` (= `windows-2022`) | `windows-2019` |
+| Operating System | Supported |
+| ---------------- | --------- |
+| Ubuntu  | `ubuntu-18.04`, `ubuntu-20.04`, `ubuntu-22.04` |
+| macOS   | `macos-10.15`, `macos-11`, `macos-12` |
+| Windows | `windows-2019`, `windows-2022` |
 
 The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder)
 and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).
@@ -132,7 +132,7 @@ and the [condition and expression syntax](https://help.github.com/en/actions/ref
 * engine-version like `ruby-2.6.5` and `truffleruby-19.3.0`
 * short version like `'2.6'`, automatically using the latest release matching that version (`2.6.10`)
 * version only like `'2.6.5'`, assumes MRI for the engine
-* engine only like `truffleruby`, uses the latest stable release of that implementation
+* engine only like `ruby` and `truffleruby`, uses the latest stable release of that implementation
 * `.ruby-version` reads from the project's `.ruby-version` file
 * `.tool-versions` reads from the project's `.tool-versions` file
 * If the `ruby-version` input is not specified, `.ruby-version` is tried first, followed by `.tool-versions`
@@ -249,7 +249,7 @@ This follows the [recommendations](https://github.com/actions/toolkit/blob/maste
 ## Using self-hosted runners
 
 This action might work with [self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners)
-if the [virtual environment](https://github.com/actions/virtual-environments) is very similar to the ones used by GitHub runners. Notably:
+if the [Runner Image](https://github.com/actions/runner-images) is very similar to the ones used by GitHub runners. Notably:
 
 * Make sure to use the same operating system and version.
 * Set the environment variable `ImageOS` on the runner to the corresponding value on GitHub-hosted runners (e.g. `ubuntu18`/`macos1015`/`win19`). This is necessary to detect the operating system and version.

bundler.js

@@ -6,6 +6,7 @@ const cache = require('@actions/cache')
 const common = require('./common')
 
 export const DEFAULT_CACHE_VERSION = '0'
+export const BUNDLER_VERSION_REGEXP = /^\d+(?:\.\d+){0,2}$/
 
 // The returned gemfile is guaranteed to exist, the lockfile might not exist
 export function detectGemfiles() {
@@ -30,10 +31,14 @@ function readBundledWithFromGemfileLock(lockFile) {
     const bundledWithLine = lines.findIndex(line => /^BUNDLED WITH$/.test(line.trim()))
     if (bundledWithLine !== -1) {
       const nextLine = lines[bundledWithLine+1]
-      if (nextLine && /^\d+/.test(nextLine.trim())) {
+      if (nextLine) {
         const bundlerVersion = nextLine.trim()
-        console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
-        return bundlerVersion
+        if (BUNDLER_VERSION_REGEXP.test(bundlerVersion)) {
+          console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
+          return bundlerVersion
+        } else {
+          console.log(`Could not parse BUNDLED WITH version as a valid Bundler release, ignoring it: ${bundlerVersion}`)
+        }
       }
     }
   }
@@ -95,7 +100,7 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     bundlerVersion = '2'
   }
 
-  if (/^\d+(?:\.\d+){0,2}$/.test(bundlerVersion)) {
+  if (BUNDLER_VERSION_REGEXP.test(bundlerVersion)) {
     // OK - input is a 1, 2, or 3 part version number
   } else {
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
@@ -115,6 +120,19 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     }
   }
 
+  const targetRubyVersion = common.targetRubyVersion(engine, rubyVersion)
+  // Use Bundler 2.3 when we use Ruby 2.3.2 - 2.5
+  // Use Bundler 2.4 when we use Ruby 2.6-2.7
+  if (bundlerVersion == '2') {
+    if (targetRubyVersion <= 2.5) { // < 2.3.2 already handled above
+      console.log('Ruby 2.3.2 - 2.5 only works with Bundler 2.3')
+      bundlerVersion = '2.3'
+    } else if (targetRubyVersion <= 2.7) {
+      console.log('Ruby 2.6-2.7 only works with Bundler 2.4')
+      bundlerVersion = '2.4'
+    }
+  }
+
   const gem = path.join(rubyPrefix, 'bin', 'gem')
   // Workaround for https://github.com/rubygems/rubygems/issues/5245
   // and for https://github.com/oracle/truffleruby/issues/2780

common.js

@@ -95,6 +95,23 @@ export function isBundler2dot2Default(engine, rubyVersion) {
   }
 }
 
+export function targetRubyVersion(engine, rubyVersion) {
+  const version = floatVersion(rubyVersion)
+  if (engine === 'ruby') {
+    return version
+  } else if (engine === 'jruby') {
+    if (version === 9.1) {
+      return 2.3
+    } else if (version === 9.2) {
+      return 2.5
+    } else if (version === 9.3) {
+      return 2.6
+    }
+  }
+
+  return 9.9 // unknown, assume recent
+}
+
 export function floatVersion(rubyVersion) {
   const match = rubyVersion.match(/^\d+\.\d+/)
   if (match) {

gemfiles/bundler-dev.gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem "path"

gemfiles/bundler-dev.gemfile.lock

@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    path (2.0.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  path
+
+BUNDLED WITH
+   2.4.0.dev

new-version.rb

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

new-versions.rb

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

package.json

@@ -23,10 +23,10 @@
   "homepage": "https://github.com/ruby/setup-ruby",
   "dependencies": {
     "@actions/cache": "^3",
-    "@actions/core": "^1.9.1",
+    "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
     "@actions/io": "^1.1.2",
-    "@actions/tool-cache": "^1.7.2",
+    "@actions/tool-cache": "^2",
     "semver": "^7.3.7"
   },
   "devDependencies": {

ruby-builder-versions.json

@@ -8,16 +8,17 @@
     "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",
-    "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.1.0-preview1", "3.1.0", "3.1.1", "3.1.2",
-    "3.2.0-preview1", "3.2.0-preview2",
+    "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": [

windows-versions.json

@@ -40,14 +40,17 @@
   "2.7.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.4-1/rubyinstaller-2.7.4-1-x64.7z",
   "2.7.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.5-1/rubyinstaller-2.7.5-1-x64.7z",
   "2.7.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.6-1/rubyinstaller-2.7.6-1-x64.7z",
+  "2.7.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.7-1/rubyinstaller-2.7.7-1-x64.7z",
   "3.0.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.0-1/rubyinstaller-3.0.0-1-x64.7z",
   "3.0.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.1-1/rubyinstaller-3.0.1-1-x64.7z",
   "3.0.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.2-1/rubyinstaller-3.0.2-1-x64.7z",
   "3.0.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.3-1/rubyinstaller-3.0.3-1-x64.7z",
   "3.0.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.4-1/rubyinstaller-3.0.4-1-x64.7z",
+  "3.0.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.5-1/rubyinstaller-3.0.5-1-x64.7z",
   "3.1.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.0-1/rubyinstaller-3.1.0-1-x64.7z",
   "3.1.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.1-1/rubyinstaller-3.1.1-1-x64.7z",
   "3.1.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.2-1/rubyinstaller-3.1.2-1-x64.7z",
+  "3.1.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.3-1/rubyinstaller-3.1.3-1-x64.7z",
   "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z",
   "mingw": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z",
   "mswin": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z",

yarn.lock

@@ -18,7 +18,7 @@
     semver "^6.1.0"
     uuid "^3.3.3"
 
-"@actions/core@^1.10.0", "@actions/core@^1.2.6", "@actions/core@^1.9.1":
+"@actions/core@^1.10.0", "@actions/core@^1.2.6":
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.10.0.tgz#44551c3c71163949a2f06e94d9ca2157a0cfac4f"
   integrity sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==
@@ -41,13 +41,6 @@
     "@actions/core" "^1.2.6"
     minimatch "^3.0.4"
 
-"@actions/http-client@^1.0.8":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz#c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"
-  integrity sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==
-  dependencies:
-    tunnel "0.0.6"
-
 "@actions/http-client@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.0.1.tgz#873f4ca98fe32f6839462a6f046332677322f99c"
@@ -60,14 +53,14 @@
   resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.2.tgz#766ac09674a289ce0f1550ffe0a6eac9261a8ea9"
   integrity sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw==
 
-"@actions/tool-cache@^1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-1.7.2.tgz#389ad15916f91999959c6b2865144839ecc571a9"
-  integrity sha512-GYlcgg/PK2RWBrGG2sFg6s7im3S94LMKuqAv8UPDq/pGTZbuEvmN4a95Fn1Z19OE+vt7UbUHeewOD5tEBT+4TQ==
+"@actions/tool-cache@^2":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-2.0.1.tgz#8a649b9c07838d9d750c9864814e66a7660ab720"
+  integrity sha512-iPU+mNwrbA8jodY8eyo/0S/QqCKDajiR8OxWTnSk/SnYg0sj8Hp4QcUEVC1YFpHWXtrfbQrE13Jz4k4HXJQKcA==
   dependencies:
     "@actions/core" "^1.2.6"
     "@actions/exec" "^1.0.0"
-    "@actions/http-client" "^1.0.8"
+    "@actions/http-client" "^2.0.1"
     "@actions/io" "^1.1.1"
     semver "^6.1.0"
     uuid "^3.3.2"