Export BUNDLER_VERSION after installing Bundler

* Fixes https://github.com/ruby/setup-ruby/issues/440

.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', 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 }
@@ -190,10 +195,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./
         with:
-          ruby-version: '2.2'
-          rubygems: 2.7.11
-      - run: gem --version | grep -F "2.7.11"
-      - run: bundle --version | grep -F "1.16.6"
+          ruby-version: '3.1.0'
+          rubygems: 3.4.0
+      - run: gem --version | grep -F "3.4.0"
+      - run: bundle --version | grep -F "2.4.0"
 
   testFixedBundlerVersionForOldRuby:
     name: "Test bundler: 1.x for old Ruby"
@@ -239,6 +244,29 @@ 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
+    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,10 +15,10 @@ 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 |
-| `truffleruby` | 19.3.0 - 22.2.0, head |
-| `truffleruby+graalvm` | 21.2.0 - 22.2.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 |
 
 `ruby-debug` is the same as `ruby-head` but with assertions enabled (`-DRUBY_DEBUG=1`).  
 
@@ -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

@@ -7,6 +7,10 @@ const common = require('./common')
 
 export const DEFAULT_CACHE_VERSION = '0'
 
+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() {
   const gemfilePath = process.env['BUNDLE_GEMFILE'] || 'Gemfile'
@@ -30,10 +34,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 (isValidBundlerVersion(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 +103,7 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     bundlerVersion = '2'
   }
 
-  if (/^\d+(?:\.\d+){0,2}$/.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}`)
@@ -115,15 +123,37 @@ 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
-  const force = (platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) ? ['--force'] : []
+  // and for https://github.com/oracle/truffleruby/issues/2780
+  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])
 
+  if (bundlerVersion.startsWith('1') && common.isBundler2Default(engine, rubyVersion)) {
+    // If Bundler 1 is specified on Rubies which ship with Bundler 2,
+    // we need to specify which Bundler version to use explicitly until the lockfile exists.
+    // We actually set it globally for the case of bundler-cache: false with manual bundler install later.
+    console.log(`Setting BUNDLER_VERSION=${bundlerVersion} to ensure Bundler 1 is used`)
+    core.exportVariable('BUNDLER_VERSION', bundlerVersion)
+  }
+
   return bundlerVersion
 }
 
@@ -133,27 +163,19 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
     return false
   }
 
-  let envOptions = {}
-  if (bundlerVersion.startsWith('1') && common.isBundler2Default(engine, rubyVersion)) {
-    // If Bundler 1 is specified on Rubies which ship with Bundler 2,
-    // we need to specify which Bundler version to use explicitly until the lockfile exists.
-    console.log(`Setting BUNDLER_VERSION=${bundlerVersion} for "bundle config|lock" commands below to ensure Bundler 1 is used`)
-    envOptions = { env: { ...process.env, BUNDLER_VERSION: bundlerVersion } }
-  }
-
   // config
   const cachePath = 'vendor/bundle'
   // An absolute path, so it is reliably under $PWD/vendor/bundle, and not relative to the gemfile's directory
   const bundleCachePath = path.join(process.cwd(), cachePath)
 
-  await exec.exec('bundle', ['config', '--local', 'path', bundleCachePath], envOptions)
+  await exec.exec('bundle', ['config', '--local', 'path', bundleCachePath])
 
   if (fs.existsSync(lockFile)) {
-    await exec.exec('bundle', ['config', '--local', 'deployment', 'true'], envOptions)
+    await exec.exec('bundle', ['config', '--local', 'deployment', 'true'])
   } else {
     // Generate the lockfile so we can use it to compute the cache key.
     // This will also automatically pick up the latest gem versions compatible with the Gemfile.
-    await exec.exec('bundle', ['lock'], envOptions)
+    await exec.exec('bundle', ['lock'])
   }
 
   await afterLockFile(lockFile, platform, engine, rubyVersion)

common.js

@@ -95,6 +95,31 @@ 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
+    }
+  } else if (engine.startsWith('truffleruby')) {
+    if (version < 21.0) {
+      return 2.6
+    } else if (version < 22.0) {
+      return 2.7
+    } else if (version < 23.0) {
+      return 3.0
+    }
+  }
+
+  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

@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/ruby/setup-ruby",
   "dependencies": {
-    "@actions/cache": "^2.0.2",
-    "@actions/core": "^1.9.1",
+    "@actions/cache": "^3",
+    "@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,28 +8,29 @@
     "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": [
     "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.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.0.0.2", "22.1.0", "22.2.0", "22.3.0",
     "head"
   ]
 }

windows-versions.json

@@ -40,14 +40,18 @@
   "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",
+  "3.2.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.0-1/rubyinstaller-3.2.0-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",

windows.js

@@ -1,6 +1,8 @@
 // 7z arguments
 //   -aoa overwrite existing, -bd disable progress indicator
 
+// OpenSSL version detection is needed in installGCCTools and installJRubyTools
+
 const fs = require('fs')
 const path = require('path')
 const cp = require('child_process')
@@ -80,7 +82,7 @@ export async function install(platform, engine, version) {
   // windows 2016 and 2019 need ucrt64 installed, 2022 and future images need
   // ucrt64 or mingw64 installed, depending on Ruby version
   if (((msys2Type === 'ucrt64') || !hasMSYS2PreInstalled) && common.floatVersion(version) >= 2.4) {
-    await installGCCTools(msys2Type)
+    await installGCCTools(msys2Type, version)
   }
 
   if (version === 'mswin') {
@@ -97,14 +99,23 @@ export async function install(platform, engine, version) {
 
 // Actions windows-2022 image does not contain any mingw or ucrt build tools.  Install tools for it,
 // and also install ucrt tools on earlier versions, which have msys2 and mingw tools preinstalled.
-async function installGCCTools(type) {
-  const downloadPath = await common.measure(`Downloading ${type} build tools`, async () => {
-    let url = `${msys2GCCReleaseURI}/msys2-gcc-pkgs/${type}.7z`
+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.
+  let suffix = ''
+  if ((version === 'head') || (!common.isHeadVersion(version) && common.floatVersion(version) >= 3.2)) {
+    suffix = '-3.0'
+  }
+  const downloadPath = await common.measure(`Downloading ${type}${suffix} build tools`, async () => {
+    let url = `${msys2GCCReleaseURI}/msys2-gcc-pkgs/${type}${suffix}.7z`
     console.log(url)
     return await tc.downloadTool(url)
   })
 
-  await common.measure(`Extracting  ${type} build tools`, async () =>
+  await common.measure(`Extracting  ${type}${suffix} build tools`, async () =>
     exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${msys2BasePath}`], { silent: true }))
 }
 
@@ -129,7 +140,8 @@ async function installMSYS2Tools() {
 // windows-2022 and later images
 export async function installJRubyTools() {
   await installMSYS2Tools()
-  await installGCCTools('mingw64')
+  // Will need to add OpenSSL version detection when JRuby uses OpenSSL 3.0 ?
+  await installGCCTools('mingw64', '2.7')
 }
 
 // Install vcpkg files needed to build mswin Ruby

yarn.lock

@@ -2,22 +2,23 @@
 # yarn lockfile v1
 
 
-"@actions/cache@^2.0.2":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@actions/cache/-/cache-2.0.6.tgz#fa5d150219c11eb297b2b766b5ba53aeee3e6e3e"
-  integrity sha512-Z39ZrWaTRRPaV/AOQdY7hve+Iy/HloH5prpz+k+0lZgGQs/3SeO0UYSIakVuXOk2pdMZnl0Nv0PoK1rmh9YfGQ==
+"@actions/cache@^3":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@actions/cache/-/cache-3.0.6.tgz#b76c51a78c927fcf0eb631b96a07e34f575c422b"
+  integrity sha512-Tttit+nqmxgb2M5Ufj5p8Lwd+fx329HOTLzxMrY4aaaZqBzqetgWlEfszMyiXfX4cJML+bzLJbyD9rNYt8TJ8g==
   dependencies:
-    "@actions/core" "^1.2.6"
+    "@actions/core" "^1.10.0"
     "@actions/exec" "^1.0.1"
     "@actions/glob" "^0.1.0"
     "@actions/http-client" "^2.0.1"
     "@actions/io" "^1.0.1"
+    "@azure/abort-controller" "^1.1.0"
     "@azure/ms-rest-js" "^2.6.0"
     "@azure/storage-blob" "^12.8.0"
     semver "^6.1.0"
     uuid "^3.3.3"
 
-"@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==
@@ -40,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"
@@ -59,19 +53,19 @@
   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"
 
-"@azure/abort-controller@^1.0.0":
+"@azure/abort-controller@^1.0.0", "@azure/abort-controller@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249"
   integrity sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==
@@ -87,14 +81,14 @@
     tslib "^2.2.0"
 
 "@azure/core-http@^2.0.0":
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-2.2.7.tgz#f4f52b3b7b8adb5387acf11102e751358a31fa6f"
-  integrity sha512-TyGMeDm90mkRS8XzSQbSMD+TqnWL1XKGCh0x0QVGMD8COH2yU0q5SaHm/IBEBkzcq0u73NhS/p57T3KVSgUFqQ==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-2.3.1.tgz#eed8a7d012ba8c576c557828f66af0fc4e52b23a"
+  integrity sha512-cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q==
   dependencies:
     "@azure/abort-controller" "^1.0.0"
     "@azure/core-auth" "^1.3.0"
     "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/core-util" "^1.1.0"
+    "@azure/core-util" "^1.1.1"
     "@azure/logger" "^1.0.0"
     "@types/node-fetch" "^2.5.0"
     "@types/tunnel" "^0.0.3"
@@ -117,9 +111,9 @@
     tslib "^2.2.0"
 
 "@azure/core-paging@^1.1.1":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.3.0.tgz#ebf6520a931be7d5ff1cf58bc4fe6c14d6a3080d"
-  integrity sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.4.0.tgz#b04a73ad18149733a848c3089a5e5ed144592338"
+  integrity sha512-tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw==
   dependencies:
     tslib "^2.2.0"
 
@@ -131,7 +125,7 @@
     "@opentelemetry/api" "^1.0.1"
     tslib "^2.2.0"
 
-"@azure/core-util@^1.1.0":
+"@azure/core-util@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.1.1.tgz#8f87b3dd468795df0f0849d9f096c3e7b29452c1"
   integrity sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==
@@ -162,9 +156,9 @@
     xml2js "^0.4.19"
 
 "@azure/storage-blob@^12.8.0":
-  version "12.11.0"
-  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.11.0.tgz#2e27902ab293715411ab1f7c8fae422ad0b4b827"
-  integrity sha512-na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==
+  version "12.12.0"
+  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.12.0.tgz#25e277c885692d5adcd8c2a949789b2837a74c59"
+  integrity sha512-o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g==
   dependencies:
     "@azure/abort-controller" "^1.0.0"
     "@azure/core-http" "^2.0.0"
@@ -176,9 +170,9 @@
     tslib "^2.2.0"
 
 "@opentelemetry/api@^1.0.1":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.2.0.tgz#89ef99401cde6208cff98760b67663726ef26686"
-  integrity sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.3.0.tgz#27c6f776ac3c1c616651e506a89f438a0ed6a055"
+  integrity sha512-YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ==
 
 "@types/node-fetch@^2.5.0":
   version "2.6.2"
@@ -189,9 +183,9 @@
     form-data "^3.0.0"
 
 "@types/node@*":
-  version "18.8.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.8.5.tgz#6a31f820c1077c3f8ce44f9e203e68a176e8f59e"
-  integrity sha512-Bq7G3AErwe5A/Zki5fdD3O6+0zDChhg671NfPjtIcbtzDNZTv4NPKMRFr7gtYPG7y+B8uTiNK4Ngd9T0FTar6Q==
+  version "18.11.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
+  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
 
 "@types/tunnel@^0.0.3":
   version "0.0.3"
@@ -394,9 +388,9 @@ tslib@^1.10.0:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
 tunnel@0.0.6, tunnel@^0.0.6:
   version "0.0.6"