Add ruby-4.0.1

* And it is currently based on the latest release, that is 4.0.0.

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       GH_TOKEN: ${{ github.token }}
       GH_REPO: ${{ github.repository }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - uses: ./

.github/workflows/test.yml

@@ -13,93 +13,31 @@ permissions:
   contents: read
 
 jobs:
+  test-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+    - uses: actions/checkout@v6
+    - uses: ./
+      with:
+        ruby-version: ruby
+    - id: matrix
+      run: echo "matrix=$(ruby generate-test-matrix.rb)" | tee -a "$GITHUB_OUTPUT"
+    - run: echo "$MATRIX" | yq -P
+      env:
+        MATRIX: ${{ steps.matrix.outputs.matrix }}
+
   test:
+    needs: [test-matrix]
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm, macos-13, macos-14, macos-15, windows-2022, windows-2025, windows-11-arm ]
-        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', '3.3', '3.4', ruby-head,
-          jruby, jruby-head,
-          truffleruby, truffleruby-head,
-          truffleruby+graalvm, truffleruby+graalvm-head
-        ]
-        include:
-        - { os: windows-2022, ruby: mingw }
-        - { os: windows-2022, ruby: mswin }
-        - { os: windows-2022, ruby: ucrt  }
-        - { os: windows-2025, ruby: mingw }
-        - { os: windows-2025, ruby: mswin }
-        - { os: windows-2025, ruby: ucrt  }
-        - { os: ubuntu-24.04, ruby: asan }
-        - { os: ubuntu-24.04, ruby: 3.4-asan }
-        exclude:
-        # https://github.com/ruby/setup-ruby/issues/496
-        - { os: ubuntu-22.04, ruby: '2.2' }
-        - { os: ubuntu-24.04, ruby: '1.9' }
-        - { os: ubuntu-24.04, ruby: '2.2' }
-        # These old Rubies fail to compile on macOS arm64
-        - { os: macos-14, ruby: '1.9' }
-        - { os: macos-14, ruby: '2.0' }
-        - { os: macos-14, ruby: '2.1' }
-        - { os: macos-14, ruby: '2.2' }
-        - { os: macos-14, ruby: '2.3' }
-        - { os: macos-14, ruby: '2.4' }
-        - { os: macos-14, ruby: '2.5' }
-        - { os: macos-15, ruby: '1.9' }
-        - { os: macos-15, ruby: '2.0' }
-        - { os: macos-15, ruby: '2.1' }
-        - { os: macos-15, ruby: '2.2' }
-        - { os: macos-15, ruby: '2.3' }
-        - { os: macos-15, ruby: '2.4' }
-        - { os: macos-15, ruby: '2.5' }
-        # These old Rubies fail to compile or segfault on Linux arm64
-        - { os: ubuntu-22.04-arm, ruby: '1.9' }
-        - { os: ubuntu-22.04-arm, ruby: '2.0' }
-        - { os: ubuntu-22.04-arm, ruby: '2.1' }
-        - { os: ubuntu-22.04-arm, ruby: '2.2' }
-        - { os: ubuntu-24.04-arm, ruby: '1.9' }
-        - { os: ubuntu-24.04-arm, ruby: '2.0' }
-        - { os: ubuntu-24.04-arm, ruby: '2.1' }
-        - { os: ubuntu-24.04-arm, ruby: '2.2' }
-        # RubyInstaller windows-arm64 builds only exist for Ruby 3.4+
-        - { os: windows-11-arm, ruby: '2.0' }
-        - { os: windows-11-arm, ruby: '2.1' }
-        - { os: windows-11-arm, ruby: '2.2' }
-        - { os: windows-11-arm, ruby: '2.3' }
-        - { os: windows-11-arm, ruby: '2.4' }
-        - { os: windows-11-arm, ruby: '2.5' }
-        - { os: windows-11-arm, ruby: '2.6' }
-        - { os: windows-11-arm, ruby: '2.7' }
-        - { os: windows-11-arm, ruby: '3.0' }
-        - { os: windows-11-arm, ruby: '3.1' }
-        - { os: windows-11-arm, ruby: '3.2' }
-        - { os: windows-11-arm, ruby: '3.3' }
-        # https://github.com/ruby/jruby-dev-builder/pull/14#issuecomment-2829841247
-        - { os: windows-11-arm, ruby: jruby }
-        - { os: windows-11-arm, ruby: jruby-head }
-        # RubyInstaller has no 64-bit builds of 1.9 on Windows
-        - { os: windows-2022, ruby: '1.9' }
-        - { os: windows-2025, ruby: '1.9' }
-        - { os: windows-11-arm, ruby: '1.9' }
-        # TruffleRuby does not support Windows
-        - { os: windows-2022, ruby: truffleruby }
-        - { os: windows-2025, ruby: truffleruby }
-        - { os: windows-11-arm, ruby: truffleruby }
-        - { os: windows-2022, ruby: truffleruby-head }
-        - { os: windows-2025, ruby: truffleruby-head }
-        - { os: windows-11-arm, ruby: truffleruby-head }
-        - { os: windows-2022, ruby: truffleruby+graalvm }
-        - { os: windows-2025, ruby: truffleruby+graalvm }
-        - { os: windows-11-arm, ruby: truffleruby+graalvm }
-        - { os: windows-2022, ruby: truffleruby+graalvm-head }
-        - { os: windows-2025, ruby: truffleruby+graalvm-head }
-        - { os: windows-11-arm, ruby: truffleruby+graalvm-head }
-
+        include: ${{ fromJSON(needs.test-matrix.outputs.matrix) }}
     name: ${{ matrix.os }} ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - uses: ./
       with:
@@ -116,7 +54,7 @@ jobs:
       run: |
         ruby -e "puts 'build compiler: ' + RbConfig::CONFIG.fetch('CC_VERSION_MESSAGE', 'unknown').lines.first"
     - name: gcc and ridk version (mingw)
-      if: startsWith(matrix.os, 'windows')
+      if: runner.os == 'Windows'
       run: |
         $abi, $plat = $(ruby -e "STDOUT.write RbConfig::CONFIG['ruby_version'] + ' ' + RUBY_PLATFORM").split(' ')
         if ($plat.Contains('mingw')) {
@@ -157,15 +95,15 @@ jobs:
     - name: bundle install (bash)
       run: bundle install
       shell: bash
-      if: startsWith(matrix.os, 'windows')
+      if: runner.os == 'Windows'
     - name: bundle exec rake --version (bash)
       run: bundle exec rake --version
       shell: bash
-      if: startsWith(matrix.os, 'windows')
+      if: runner.os == 'Windows'
     - name: bundle exec rake (bash)
       run: bundle exec rake
       shell: bash
-      if: startsWith(matrix.os, 'windows')
+      if: runner.os == 'Windows'
 
     - name: Test `gem github:` in a Gemfile
       run: bundle install
@@ -182,9 +120,9 @@ jobs:
       if: "matrix.ruby != 'mingw' && matrix.ruby != 'mswin' && matrix.ruby != 'ucrt'"
     - name: which rake
       run: which -a rake
-      if: "!startsWith(matrix.os, 'windows')"
+      if: runner.os != 'Windows'
     - name: where ruby, rake, bundle
-      if: startsWith(matrix.os, 'windows')
+      if: runner.os == 'Windows'
       run: |
         $ErrorActionPreference = 'Continue'
         $where = 'ruby', 'rake', 'bundle'
@@ -198,15 +136,14 @@ jobs:
       shell: bash
       run: echo ~ && bundle install
     - name: Windows JRuby
-      # Should be startsWith(matrix.ruby, 'jruby') but broken on jruby-head: https://github.com/jruby/jruby/issues/8623
-      if: startsWith(matrix.os, 'windows') && matrix.ruby == 'jruby'
+      if: runner.os == 'Windows' && startsWith(matrix.ruby, 'jruby')
       run: gem install sassc
 
   testDotRubyVersion:
     name: "Test .ruby-version"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: echo "ruby-3.4.0" > .ruby-version
       - uses: ./
       - run: ruby -v | grep -F "ruby 3.4.0"
@@ -215,7 +152,7 @@ jobs:
     name: "Test .tool-versions"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: echo -e "nodejs 16.0.0\nruby   3.4.0" > .tool-versions
       - uses: ./
       - run: ruby -v | grep -F "ruby 3.4.0"
@@ -224,7 +161,7 @@ jobs:
     name: "Test mise.toml"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: echo -e "[tools]\nnode = '18'\nruby = '3.4.0'" > mise.toml
       - uses: ./
       - run: ruby -v | grep -F "ruby 3.4.0"
@@ -233,13 +170,25 @@ jobs:
     name: "Test with no Gemfile"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: rm Gemfile
       - uses: ./
         with:
           ruby-version: '2.6'
       - run: ruby -v
 
+  testNoGemfileWithBundlerCache:
+    name: "Test with no Gemfile but with bundler-cache"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - run: rm Gemfile
+      - uses: ./
+        with:
+          ruby-version: '2.6'
+          bundler-cache: true
+      - run: ruby -v
+
   testLatestRubygemsVersion:
     name: "Test rubygems: latest on ${{ matrix.ruby }}"
     runs-on: ubuntu-latest
@@ -255,7 +204,7 @@ jobs:
         - { ruby: '2.3', expected_rubygems_version: '3.3.27' }
         - { ruby: '2.0', expected_rubygems_version: '2.7.11' }
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: ./
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -266,7 +215,7 @@ jobs:
     name: "Test rubygems: version upgrades RubyGems to that version if the default is older"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: ./
       with:
         ruby-version: '2.6'
@@ -277,7 +226,7 @@ jobs:
     name: "Test rubygems: version noops if the default is newer"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: ./
       with:
         ruby-version: '3.1.0'
@@ -288,7 +237,7 @@ jobs:
     name: "Test rubygems: version uses the Bundler installed by the rubygems update"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./
         with:
           ruby-version: '3.1.0'
@@ -300,7 +249,7 @@ jobs:
     name: "Test bundler: 1.x for old Ruby"
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./
         with:
           ruby-version: '2.3'
@@ -311,7 +260,7 @@ jobs:
     name: "Test with a major Bundler version"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: ./
       with:
         ruby-version: '2.6'
@@ -322,7 +271,7 @@ jobs:
     name: "Test with a minor Bundler version"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: ./
       with:
         ruby-version: '2.6'
@@ -333,18 +282,31 @@ jobs:
     name: "Test with an exact Bundler version"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: ./
       with:
         ruby-version: '2.6'
         bundler: 2.2.3
     - run: bundle --version | grep -F "Bundler version 2.2.3"
 
+  # https://github.com/ruby/setup-ruby/issues/845
+  testOlderBundlerVersion:
+    name: "Test with an older Bundler version than the one of the default gem"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: ./
+      with:
+        ruby-version: '4.0'
+        bundler: 2.7.2
+        bundler-cache: true
+    - run: bundle --version | grep -F "Bundler version 2.7.2"
+
   testBundlerPre:
     name: "Test with a Bundler pre/rc version"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./
         with:
           ruby-version: '2.6'
@@ -357,7 +319,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler-dev.gemfile
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./
         with:
           ruby-version: ruby-head
@@ -369,7 +331,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler1.gemfile
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./
         with:
           ruby-version: '2.7'
@@ -387,31 +349,18 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./
         with:
           ruby-version: '3.2'
           bundler-cache: true
       - run: bundle exec rails --version
 
-  testTruffleRubyNokogiri:
-    name: "Test installing a Gemfile with nokogiri on TruffleRuby"
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/nokogiri.gemfile
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./
-        with:
-          ruby-version: truffleruby-head
-          bundler-cache: true
-      - run: bundle list | grep nokogiri
-
   testWindowsToolchain:
     name: "Test windows-toolchain: none"
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./
         with:
           ruby-version: '2.7'
@@ -423,7 +372,7 @@ jobs:
   lint:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - run: yarn install
     - run: yarn run package
     - name: Check generated files are up to date

.github/workflows/update-v1-branch.yml

@@ -9,7 +9,7 @@ jobs:
   update_branch:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - run: git push origin HEAD:v1

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.5.0-preview1, head, debug, mingw, mswin, ucrt |
-| `jruby` | 9.1.17.0 - 10.0.1.0, head |
-| `truffleruby` | 19.3.0 - 24.2.1, head |
-| `truffleruby+graalvm` | 21.2.0 - 24.2.1, head |
+| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 4.0.1, head, debug, mingw, mswin, ucrt |
+| `jruby` | 9.1.17.0 - 10.0.2.0, head |
+| `truffleruby` | 19.3.0 - 33.0.0, head |
+| `truffleruby+graalvm` | 21.2.0 - 33.0.0, head |
 
 `ruby-debug` is the same as `ruby-head` but with assertions enabled (`-DRUBY_DEBUG=1`).
 
@@ -26,7 +26,7 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 Native extensions are automatically compiled with AddressSanitizer when using `ruby-asan`.
 `ruby-asan` is currently only available on `ubuntu-24.04`.
 
-`ruby-3.4-asan` is similar to `ruby-asan` but built from the latest stable 3.4 release tag.
+`asan-release` is similar to `ruby-asan` but built from the latest stable release tag.
 Like `ruby-asan`, it's currently only available on `ubuntu-24.04`.
 
 Regarding Windows ruby master builds, `mingw` is a MSYS2/MinGW build, `head` & `ucrt` are MSYS2/UCRT64
@@ -45,12 +45,12 @@ which means Ruby ≤ 2.4 is unmaintained and considered insecure.
 
 ### Supported Platforms
 
-The action works on these [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-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.
+The action works on these [GitHub-hosted runners](https://docs.github.com/en/actions/reference/runners/github-hosted-runners) images. Runner images not listed below are not supported yet. `$OS-latest` just alias to one of these images.
 
 | Operating System | Supported |
 | ---------------- | --------- |
 | Ubuntu  | `ubuntu-22.04`, `ubuntu-24.04`, `ubuntu-22.04-arm`, `ubuntu-24.04-arm` |
-| macOS   | `macos-13` and newer versions |
+| macOS   | `macos-14` and newer versions |
 | Windows | `windows-2022`, `windows-2025`, `windows-11-arm` |
 
 Not all combinations of runner images and versions are supported.
@@ -76,10 +76,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3' # Not needed with a .ruby-version, .tool-versions or mise.toml
+        ruby-version: '3.4' # Not needed with a .ruby-version, .tool-versions or mise.toml
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - run: bundle exec rake
 ```
@@ -98,10 +98,10 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', head, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', head, jruby, jruby-head, truffleruby, truffleruby-head]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -124,10 +124,10 @@ jobs:
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3'
+          ruby-version: '3.4'
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - run: bundle exec rake
 ```
@@ -230,6 +230,22 @@ It is also possible to cache gems manually, but this is not recommended because
 There are many concerns which means using `actions/cache` is never enough for caching gems (e.g., incomplete cache key, cleaning old gems when restoring from another key, correctly hashing the lockfile if not checked in, OS versions, ABI compatibility for `ruby-head`, etc).
 So, please use `bundler-cache: true` instead and report any issue.
 
+### Authentication Token
+
+By default, this action uses `${{ github.token }}` to authenticate when downloading Ruby release assets from GitHub.
+This helps avoid rate limiting issues.
+
+If you're running this action on a GitHub Enterprise Server (GHES) instance, or if you're experiencing rate limiting,
+you can provide a custom token:
+
+```yaml
+    - uses: ruby/setup-ruby@v1
+      with:
+        token: ${{ secrets.MY_GITHUB_TOKEN }}
+```
+
+In most cases, you don't need to set this input as the default value is sufficient for use on github.com.
+
 ## Windows
 
 Note that running CI on Windows can be quite challenging if you are not very familiar with Windows.

action.yml

@@ -44,6 +44,12 @@ inputs:
       It also sets environment variables using 'ridk' or 'vcvars64.bat' based on the selected Ruby.
       At present, the only other setting than 'default' is 'none', which only adds Ruby to PATH.
       No build tools or packages are installed, nor are any ENV setting changed to activate them.
+  token:
+    description: |
+      Used to authenticate with GitHub when downloading Ruby release assets.
+      When running this action on github.com, the default value is sufficient.
+      When running on GHES, you can pass a personal access token for github.com if you are experiencing rate limiting.
+    default: ${{ github.server_url == 'https://github.com' && github.token || '' }}
 
 outputs:
   ruby-prefix:

bundler.js

@@ -1,4 +1,5 @@
 const fs = require('fs')
+const os = require('os')
 const path = require('path')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
@@ -48,16 +49,6 @@ function readBundledWithFromGemfileLock(lockFile) {
   return null
 }
 
-async function afterLockFile(lockFile, platform, engine, rubyVersion) {
-  if (engine.startsWith('truffleruby') && common.floatVersion(rubyVersion) < 21.1 && platform.startsWith('ubuntu-')) {
-    const contents = fs.readFileSync(lockFile, 'utf8')
-    if (contents.includes('nokogiri')) {
-      await common.measure('Installing libxml2-dev libxslt-dev, required to install nokogiri on TruffleRuby < 21.1', async () =>
-        exec.exec('sudo', ['apt-get', '-yqq', 'install', 'libxml2-dev', 'libxslt-dev'], { silent: true }))
-    }
-  }
-}
-
 export async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, platform, rubyPrefix, engine, rubyVersion) {
   let bundlerVersion = bundlerVersionInput
 
@@ -76,17 +67,15 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     }
   }
 
-  const floatVersion = common.floatVersion(rubyVersion)
-
   if (bundlerVersion === 'default') {
-    if (common.isBundler2dot2Default(engine, rubyVersion)) {
+    if (common.isBundler2dot2PlusDefault(engine, rubyVersion)) {
       if (common.windows && engine === 'ruby' && (common.isStableVersion(engine, rubyVersion) || rubyVersion === 'head')) {
         // https://github.com/ruby/setup-ruby/issues/371
         console.log(`Installing latest Bundler for ${engine}-${rubyVersion} on Windows because bin/bundle does not work in bash otherwise`)
         bundlerVersion = 'latest'
       } else {
-        console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
-        return '2'
+        console.log(`Using Bundler shipped with ${engine}-${rubyVersion}`)
+        return common.isBundler4PlusDefault(engine, rubyVersion) ? '4' : '2'
       }
     } else if (common.hasBundlerDefaultGem(engine, rubyVersion)) {
       // Those Rubies have a old Bundler default gem < 2.2 which does not work well for `gem 'foo', github: 'foo/foo'`:
@@ -99,8 +88,15 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     }
   }
 
+  const targetRubyVersion = common.targetRubyVersion(engine, rubyVersion)
+
   if (bundlerVersion === 'latest') {
-    bundlerVersion = '2'
+    // Bundler 4 requires Ruby 3.2+
+    if (targetRubyVersion < 3.2) {
+      bundlerVersion = '2'
+    } else {
+      bundlerVersion = '4'
+    }
   }
 
   if (isValidBundlerVersion(bundlerVersion)) {
@@ -109,24 +105,29 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
   }
 
-  // Use Bundler 1 when we know Bundler 2 does not work
-  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')
+  // Only use Bundler 4 on Ruby 3.2+
+  if (common.floatVersion(bundlerVersion) >= 4 && targetRubyVersion < 3.2) {
+    console.log('Bundler 4 requires Ruby 3.2+, using Bundler 2 instead on Ruby < 3.2')
+    bundlerVersion = '2'
+  }
+
+  // Use Bundler 1 when we know Bundler 2+ does not work
+  if (common.floatVersion(bundlerVersion) >= 2) {
+    if (engine === 'ruby' && targetRubyVersion <= 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)) {
       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 === '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')
+      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'
     }
   }
 
-  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 (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'
@@ -146,6 +147,14 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
   return bundlerVersion
 }
 
+function bundlerConfigSetArgs(bundlerVersion, key, value) {
+  if (bundlerVersion.startsWith('1')) {
+    return ['config', '--local', key, value]
+  } else {
+    return ['config', 'set', '--local', key, value]
+  }
+}
+
 export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, bundlerVersion, cacheVersion) {
   if (gemfile === null) {
     console.log('Could not determine gemfile path, skipping "bundle install" and caching')
@@ -153,10 +162,10 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
   }
 
   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`)
+  if (bundlerVersion.match(/^\d+/)) {
+    // If a specific Bundler version is given or determined, we need to specify the version to use explicitly until the lockfile exists.
+    // Otherwise, a newer version of Bundler might be used.
+    console.log(`Setting BUNDLER_VERSION=${bundlerVersion} for "bundle config|lock" commands below to ensure Bundler ${bundlerVersion} is used`)
     envOptions = { env: { ...process.env, BUNDLER_VERSION: bundlerVersion } }
   }
 
@@ -165,17 +174,18 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
   // 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', bundlerConfigSetArgs(bundlerVersion, 'path', bundleCachePath), envOptions)
 
   if (fs.existsSync(lockFile)) {
-    await exec.exec('bundle', ['config', '--local', 'deployment', 'true'], envOptions)
+    await exec.exec('bundle', bundlerConfigSetArgs(bundlerVersion, 'deployment', 'true'), envOptions)
   } 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 afterLockFile(lockFile, platform, engine, rubyVersion)
+  await core.group(`Print lockfile`, async () =>
+    await exec.exec('cat', [lockFile]))
 
   // cache key
   const paths = [cachePath]
@@ -202,11 +212,14 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
     console.log(`Found cache for key: ${cachedKey}`)
   }
 
+  // Number of jobs should scale with runner, up to a point
+  const jobs = Math.min(os.availableParallelism(), 8)
   // Always run 'bundle install' to list the gems
-  await exec.exec('bundle', ['install', '--jobs', '4'])
+  await exec.exec('bundle', ['install', '--jobs', `${jobs}`])
 
   // @actions/cache only allows to save for non-existing keys
-  if (cachedKey !== key) {
+  // Also, skip saving cache for merge_group event
+  if (!common.isExactCacheKeyMatch(key, cachedKey) && process.env['GITHUB_EVENT_NAME'] !== 'merge_group') {
     if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems
       await exec.exec('bundle', ['clean'])
     }

common.js

@@ -13,9 +13,11 @@ const linuxOSInfo = require('linux-os-info')
 export const windows = (os.platform() === 'win32')
 // Extract to SSD on Windows, see https://github.com/ruby/setup-ruby/pull/14
 export const drive = (windows ? (process.env['RUNNER_TEMP'] || 'C')[0] : undefined)
+const PATH_ENV_VAR = windows ? 'Path' : 'PATH'
 
 export const inputs = {
-  selfHosted: undefined
+  selfHosted: undefined,
+  token: undefined
 }
 
 export function partition(string, separator) {
@@ -67,8 +69,8 @@ export async function time(name, block) {
 }
 
 export function isHeadVersion(rubyVersion) {
-  // 3.4-asan counts as "head" because the version cannot be selected -- you can only get whatever's latest
-  return ['head', 'debug',  'mingw', 'mswin', 'ucrt', 'asan', '3.4-asan'].includes(rubyVersion)
+  // asan-release counts as "head" because the version cannot be selected -- you can only get whatever's latest
+  return ['head', 'debug',  'mingw', 'mswin', 'ucrt', 'asan', 'asan-release'].includes(rubyVersion)
 }
 
 export function isStableVersion(engine, rubyVersion) {
@@ -80,7 +82,7 @@ export function isStableVersion(engine, rubyVersion) {
 }
 
 export function hasBundlerDefaultGem(engine, rubyVersion) {
-  return isBundler1Default(engine, rubyVersion) || isBundler2Default(engine, rubyVersion)
+  return isBundler1Default(engine, rubyVersion) || isBundler2PlusDefault(engine, rubyVersion)
 }
 
 export function isBundler1Default(engine, rubyVersion) {
@@ -95,7 +97,7 @@ export function isBundler1Default(engine, rubyVersion) {
   }
 }
 
-export function isBundler2Default(engine, rubyVersion) {
+export function isBundler2PlusDefault(engine, rubyVersion) {
   if (engine === 'ruby') {
     return floatVersion(rubyVersion) >= 2.7
   } else if (engine.startsWith('truffleruby')) {
@@ -107,7 +109,7 @@ export function isBundler2Default(engine, rubyVersion) {
   }
 }
 
-export function isBundler2dot2Default(engine, rubyVersion) {
+export function isBundler2dot2PlusDefault(engine, rubyVersion) {
   if (engine === 'ruby') {
     return floatVersion(rubyVersion) >= 3.0
   } else if (engine.startsWith('truffleruby')) {
@@ -119,6 +121,13 @@ export function isBundler2dot2Default(engine, rubyVersion) {
   }
 }
 
+const UNKNOWN_TARGET_RUBY_VERSION = 9.9
+
+export function isBundler4PlusDefault(engine, rubyVersion) {
+  const version = targetRubyVersion(engine, rubyVersion)
+  return version != UNKNOWN_TARGET_RUBY_VERSION && version >= 4.0
+}
+
 export function targetRubyVersion(engine, rubyVersion) {
   const version = floatVersion(rubyVersion)
   if (engine === 'ruby') {
@@ -132,6 +141,8 @@ export function targetRubyVersion(engine, rubyVersion) {
       return 2.6
     } else if (version === 9.4) {
       return 3.1
+    } else if (version === 10.0) {
+      return 3.4
     }
   } else if (engine.startsWith('truffleruby')) {
     if (version < 21.0) {
@@ -147,11 +158,11 @@ export function targetRubyVersion(engine, rubyVersion) {
     }
   }
 
-  return 9.9 // unknown, assume recent
+  return UNKNOWN_TARGET_RUBY_VERSION // unknown, assume recent
 }
 
 export function floatVersion(rubyVersion) {
-  const match = rubyVersion.match(/^\d+\.\d+/)
+  const match = rubyVersion.match(/^\d+(\.\d+|$)/)
   if (match) {
     return parseFloat(match[0])
   } else if (isHeadVersion(rubyVersion)) {
@@ -356,28 +367,26 @@ export function win2nix(path) {
 }
 
 export function setupPath(newPathEntries) {
-  const envPath = windows ? 'Path' : 'PATH'
-  const originalPath = process.env[envPath].split(path.delimiter)
+  const originalPath = process.env[PATH_ENV_VAR].split(path.delimiter)
   let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
 
-  core.startGroup(`Modifying ${envPath}`)
-
-  // First remove the conflicting path entries
-  if (cleanPath.length !== originalPath.length) {
-    console.log(`Entries removed from ${envPath} to avoid conflicts with default Ruby:`)
-    for (const entry of originalPath) {
-      if (!cleanPath.includes(entry)) {
-        console.log(`  ${entry}`)
+  core.group(`Modifying ${PATH_ENV_VAR}`, async () => {
+    // First remove the conflicting path entries
+    if (cleanPath.length !== originalPath.length) {
+      console.log(`Entries removed from ${PATH_ENV_VAR} to avoid conflicts with default Ruby:`)
+      for (const entry of originalPath) {
+        if (!cleanPath.includes(entry)) {
+          console.log(`  ${entry}`)
+        }
       }
+      core.exportVariable(PATH_ENV_VAR, cleanPath.join(path.delimiter))
     }
-    core.exportVariable(envPath, cleanPath.join(path.delimiter))
-  }
 
-  console.log(`Entries added to ${envPath} to use selected Ruby:`)
-  for (const entry of newPathEntries) {
-    console.log(`  ${entry}`)
-  }
-  core.endGroup()
+    console.log(`Entries added to ${PATH_ENV_VAR} to use selected Ruby:`)
+    for (const entry of newPathEntries) {
+      console.log(`  ${entry}`)
+    }
+  })
 
   core.addPath(newPathEntries.join(path.delimiter))
 }
@@ -396,20 +405,45 @@ export async function setupJavaHome(rubyPrefix) {
       console.log("JRuby failed to start, try Java 21 envs")
 
       let arch = os.arch()
-      if (arch === "x64" || os.platform() !== "darwin") {
+      if (arch === "arm64" && os.platform() === "win32") {
+        arch = "AARCH64"
+      } else if (arch === "x64" || os.platform() !== "darwin") {
         arch = "X64"
       }
 
+      // JAVA_HOME_21_AARCH64 - https://github.com/actions/partner-runner-images/blob/main/images/arm-windows-11-image.md#java
+      // JAVA_HOME_21_arm64 - https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#java
+      // JAVA_HOME_21_X64 - https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#java
       let newHomeVar = `JAVA_HOME_21_${arch}`
       let newHome = process.env[newHomeVar]
+      let bin = path.join(newHome, 'bin')
 
       if (newHome === "undefined") {
         throw new Error(`JAVA_HOME is not Java 21+ needed for JRuby and \$${newHomeVar} is not defined`)
       }
 
       console.log(`Setting JAVA_HOME to ${newHomeVar} path ${newHome}`)
-
       core.exportVariable("JAVA_HOME", newHome)
+
+      console.log(`Adding ${bin} to ${PATH_ENV_VAR}`)
+      core.addPath(bin)
     }
   })
 }
+
+// Determines if two keys are an exact match for the purposes of cache matching
+// Specifically, this is a case-insensitive match that ignores accents
+// From actions/cache@v3 src/utils/actionUtils.ts (MIT)
+export function isExactCacheKeyMatch(key, cacheKey) {
+  return !!(
+      cacheKey &&
+      cacheKey.localeCompare(key, undefined, {
+          sensitivity: 'accent'
+      }) === 0
+  );
+}
+
+export async function download(url) {
+  const auth = inputs.token ? `token ${inputs.token}` : undefined
+  return await tc.downloadTool(url, undefined, auth)
+}

gemfiles/nokogiri.gemfile

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

generate-test-matrix.rb

@@ -0,0 +1,77 @@
+require 'json'
+
+# Returns unique semantic versions and symbolic versions
+#
+# segment_count = 1 returns unique major versions
+# segment_count = 2 returns unique minor versions
+# segment_count = 3 returns unique patch versions
+def unique_versions(versions, segment_count, *symbolic)
+  versions.filter_map do |version|
+    next unless Gem::Version.correct?(version)
+
+    ruby_version = Gem::Version.new(version)
+    next if ruby_version.prerelease? && ruby_version.segments[-2] != 'p'
+
+    ruby_version.segments[0, segment_count].join('.')
+  end.uniq + versions.intersection(symbolic)
+end
+
+# Runners
+runners = %w[
+  macos-14
+  macos-15
+  macos-15-intel
+  ubuntu-22.04
+  ubuntu-24.04
+  ubuntu-22.04-arm
+  ubuntu-24.04-arm
+  windows-2022
+  windows-2025
+  windows-11-arm
+].freeze
+
+macos_runners = runners.select { |runner| runner.start_with?('macos-') }
+ubuntu_runners = runners.select { |runner| runner.start_with?('ubuntu-') }
+windows_runners, non_windows_runners = runners.partition { |runner| runner.start_with?('windows-') }
+
+macos_arm64_runners, _macos_x64_runners = macos_runners.partition { |runner| !runner.end_with?('-intel')}
+ubuntu_arm64_runners, ubuntu_x64_runners = ubuntu_runners.partition { |runner| runner.end_with?('-arm')}
+windows_arm64_runners, windows_x64_runners = windows_runners.partition { |runner| runner.end_with?('-arm') }
+
+# Versions
+ruby_builder_versions = JSON.load(File.read('ruby-builder-versions.json'))
+windows_versions = JSON.load(File.read('windows-versions.json'))
+
+# ruby: each minor release + head
+ruby_versions = unique_versions(ruby_builder_versions['ruby'], 2, 'head')
+windows_ruby_versions = unique_versions(windows_versions.keys, 2, 'head')
+matrix = non_windows_runners.product(ruby_versions) + windows_runners.product(windows_ruby_versions)
+
+# jruby: each major release + head
+jruby_versions = unique_versions(ruby_builder_versions['jruby'], 1, 'head').map { |version| "jruby-#{version}" }
+matrix += runners.product(jruby_versions)
+
+# truffleruby: latest release + head
+truffleruby_versions = %w[truffleruby truffleruby-head truffleruby+graalvm truffleruby+graalvm-head]
+matrix += non_windows_runners.product(truffleruby_versions)
+
+# ruby-loco: head
+ruby_loco_versions = %w[mingw mswin ucrt]
+matrix += windows_x64_runners.product(ruby_loco_versions)
+
+# asan: latest release + head
+asan_versions = %w[asan-release asan]
+matrix += ubuntu_x64_runners.sort.last(1).product(asan_versions)
+
+# https://github.com/ruby/setup-ruby/pull/596#discussion_r1606047680
+matrix -= (ubuntu_runners - %w[ubuntu-22.04]).product(%w[1.9])
+# https://github.com/ruby/setup-ruby/issues/496
+matrix -= ubuntu_runners.product(%w[2.2])
+# These old Rubies fail to compile on macOS arm64
+matrix -= macos_arm64_runners.product(%w[1.9 2.0 2.1 2.2 2.3 2.4 2.5])
+# These old Rubies fail to compile or segfault on Linux arm64
+matrix -= ubuntu_arm64_runners.product(%w[1.9 2.0 2.1 2.2])
+# RubyInstaller windows-arm64 builds only exist for Ruby 3.4+
+matrix -= windows_arm64_runners.product(%w[2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3])
+
+puts(JSON.generate(matrix.sort.map { |os, ruby| { os:, ruby: } }))

index.js

@@ -18,6 +18,7 @@ const inputDefaults = {
   'cache-version': bundler.DEFAULT_CACHE_VERSION,
   'self-hosted': 'false',
   'windows-toolchain': 'default',
+  'token': '',
 }
 
 // entry point when this action is run on its own
@@ -45,6 +46,7 @@ export async function setupRuby(options = {}) {
     }
   }
   common.inputs.selfHosted = inputs['self-hosted']
+  common.inputs.token = inputs['token']
 
   process.chdir(inputs['working-directory'])
 
@@ -175,7 +177,7 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
   // Well known version-platform combinations which do not work:
   if (engine === 'ruby' && platform.startsWith('macos') && os.arch() === 'arm64' && common.floatVersion(version) < 2.6) {
     throw new Error(`CRuby < 2.6 does not support macos-arm64.
-        Either use a newer Ruby version or use a macOS image running on amd64, e.g., macos-13.
+        Either use a newer Ruby version or use a macOS image running on amd64, e.g., macos-15-intel.
         Note that GitHub changed the meaning of macos-latest from macos-12 (amd64) to macos-14 (arm64):
         https://github.blog/changelog/2024-04-01-macos-14-sonoma-is-generally-available-and-the-latest-macos-runner-image/
 
@@ -188,8 +190,8 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
           - { os: macos-latest, ruby: '2.4' }
           - { os: macos-latest, ruby: '2.5' }
           include:
-          - { os: macos-13, ruby: '2.4' }
-          - { os: macos-13, ruby: '2.5' }
+          - { os: macos-15-intel, ruby: '2.4' }
+          - { os: macos-15-intel, ruby: '2.5' }
 
         But of course you should consider dropping support for these long-EOL Rubies, which cannot even be built on recent macOS machines.`)
   } else if (engine === 'truffleruby' && platform.startsWith('windows')) {

ruby-builder-versions.json

@@ -12,17 +12,18 @@
     "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.0.6", "3.0.7",
     "3.1.0-preview1", "3.1.0", "3.1.1", "3.1.2", "3.1.3", "3.1.4", "3.1.5", "3.1.6", "3.1.7",
     "3.2.0-preview1", "3.2.0-preview2", "3.2.0-preview3", "3.2.0-rc1", "3.2.0", "3.2.1", "3.2.2", "3.2.3", "3.2.4", "3.2.5", "3.2.6", "3.2.7", "3.2.8", "3.2.9",
-    "3.3.0-preview1", "3.3.0-preview2", "3.3.0-preview3", "3.3.0-rc1", "3.3.0", "3.3.1", "3.3.2", "3.3.3", "3.3.4", "3.3.5", "3.3.6", "3.3.7", "3.3.8", "3.3.9",
-    "3.4.0-preview1", "3.4.0-preview2", "3.4.0-rc1", "3.4.0", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5",
+    "3.3.0-preview1", "3.3.0-preview2", "3.3.0-preview3", "3.3.0-rc1", "3.3.0", "3.3.1", "3.3.2", "3.3.3", "3.3.4", "3.3.5", "3.3.6", "3.3.7", "3.3.8", "3.3.9", "3.3.10",
+    "3.4.0-preview1", "3.4.0-preview2", "3.4.0-rc1", "3.4.0", "3.4.1", "3.4.2", "3.4.3", "3.4.4", "3.4.5", "3.4.6", "3.4.7", "3.4.8",
     "3.5.0-preview1",
-    "head", "debug", "asan", "3.4-asan"
+    "4.0.0-preview2", "4.0.0-preview3", "4.0.0", "4.0.1",
+    "head", "debug", "asan", "asan-release"
   ],
   "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.3.11.0", "9.3.13.0", "9.3.14.0", "9.3.15.0",
-    "9.4.0.0", "9.4.1.0", "9.4.2.0", "9.4.3.0", "9.4.4.0", "9.4.5.0", "9.4.6.0", "9.4.7.0", "9.4.8.0", "9.4.9.0", "9.4.10.0", "9.4.11.0", "9.4.12.0", "9.4.12.1", "9.4.13.0",
-    "10.0.0.0", "10.0.0.1", "10.0.1.0",
+    "9.4.0.0", "9.4.1.0", "9.4.2.0", "9.4.3.0", "9.4.4.0", "9.4.5.0", "9.4.6.0", "9.4.7.0", "9.4.8.0", "9.4.9.0", "9.4.10.0", "9.4.11.0", "9.4.12.0", "9.4.12.1", "9.4.13.0", "9.4.14.0",
+    "10.0.0.0", "10.0.0.1", "10.0.1.0", "10.0.2.0",
     "head"
   ],
   "truffleruby": [
@@ -32,6 +33,8 @@
     "22.0.0.2", "22.1.0", "22.2.0", "22.3.0", "22.3.1",
     "23.0.0-preview1", "23.0.0", "23.1.0", "23.1.1", "23.1.2",
     "24.0.0", "24.0.1", "24.0.2", "24.1.0", "24.1.1", "24.1.2", "24.2.0", "24.2.1",
+    "25.0.0",
+    "33.0.0",
     "head"
   ],
   "truffleruby+graalvm": [
@@ -39,6 +42,8 @@
     "22.0.0.2", "22.1.0", "22.2.0", "22.3.0", "22.3.1",
     "23.0.0-preview1", "23.0.0", "23.1.0", "23.1.1", "23.1.2",
     "24.0.0", "24.0.1", "24.0.2", "24.1.0", "24.1.1", "24.1.2", "24.2.0", "24.2.1",
+    "25.0.0",
+    "33.0.0",
     "head"
   ]
 }

ruby-builder.js

@@ -4,11 +4,9 @@ const path = require('path')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
 const io = require('@actions/io')
-const tc = require('@actions/tool-cache')
 const common = require('./common')
 const rubyBuilderVersions = require('./ruby-builder-versions')
 
-const builderReleaseTag = 'toolcache'
 const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
 
 const windows = common.windows
@@ -76,7 +74,7 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) {
     const url = getDownloadURL(platform, engine, version)
     console.log(url)
     try {
-      return await tc.downloadTool(url)
+      return await common.download(url)
     } catch (error) {
       if (error.message.includes('404')) {
         throw new Error(`Unavailable version ${version} for ${engine} on ${platform}
@@ -105,33 +103,21 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) {
 function getDownloadURL(platform, engine, version) {
   let builderPlatform = null
   if (platform.startsWith('windows-')) {
-    if (os.arch() === 'x64') {
-      builderPlatform = 'windows-latest'
-    } else if (os.arch() === 'arm64') {
-      builderPlatform = 'windows-arm64'
-    }
+    builderPlatform = `windows-${os.arch()}`
   } else if (platform.startsWith('macos-')) {
-    if (os.arch() === 'x64') {
-      builderPlatform = 'macos-latest'
-    } else if (os.arch() === 'arm64') {
-      builderPlatform = 'macos-13-arm64'
-    }
+    builderPlatform = `darwin-${os.arch()}`
   } else if (platform.startsWith('ubuntu-')) {
-    if (os.arch() === 'x64') {
-      builderPlatform = platform
-    } else if (os.arch() === 'arm64') {
-      builderPlatform = `${platform}-arm64`
-    }
+    builderPlatform = `${platform}-${os.arch()}`
   }
 
-  if (builderPlatform === null) {
-    throw new Error(`Unknown download URL for platform ${platform}`)
+  if (builderPlatform === null || !['x64', 'arm64'].includes(os.arch())) {
+    throw new Error(`Unknown download URL for platform ${platform}-${os.arch()}`)
   }
 
   if (common.isHeadVersion(version)) {
     return getLatestHeadBuildURL(builderPlatform, engine, version)
   } else {
-    return `${releasesURL}/download/${builderReleaseTag}/${engine}-${version}-${builderPlatform}.tar.gz`
+    return `${releasesURL}/download/${engine}-${version}/${engine}-${version}-${builderPlatform}.tar.gz`
   }
 }
 

windows-toolchain-versions.json

@@ -236,6 +236,9 @@
   "3.3.9": {
     "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
   },
+  "3.3.10": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
+  },
   "3.4.1": {
     "arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64-mingw-w64@r688.7z",
     "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
@@ -256,6 +259,22 @@
     "arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
     "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
   },
+  "3.4.6": {
+    "arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
+  },
+  "3.4.7": {
+    "arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
+  },
+  "3.4.8": {
+    "arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
+  },
+  "4.0.0": {
+    "arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
+  },
   "head": {
     "arm64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-clangarm64.7z",
     "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"

windows-versions.json

@@ -236,6 +236,9 @@
   "3.3.9": {
     "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.9-1/rubyinstaller-3.3.9-1-x64.7z"
   },
+  "3.3.10": {
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.10-1/rubyinstaller-3.3.10-1-x64.7z"
+  },
   "3.4.1": {
     "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.1-2/rubyinstaller-3.4.1-2-arm.7z",
     "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.1-2/rubyinstaller-3.4.1-2-x64.7z"
@@ -256,6 +259,22 @@
     "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.5-1/rubyinstaller-3.4.5-1-arm.7z",
     "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.5-1/rubyinstaller-3.4.5-1-x64.7z"
   },
+  "3.4.6": {
+    "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.6-1/rubyinstaller-3.4.6-1-arm.7z",
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.6-1/rubyinstaller-3.4.6-1-x64.7z"
+  },
+  "3.4.7": {
+    "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.7-1/rubyinstaller-3.4.7-1-arm.7z",
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.7-1/rubyinstaller-3.4.7-1-x64.7z"
+  },
+  "3.4.8": {
+    "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.8-1/rubyinstaller-3.4.8-1-arm.7z",
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.8-1/rubyinstaller-3.4.8-1-x64.7z"
+  },
+  "4.0.0": {
+    "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-4.0.0-1/rubyinstaller-4.0.0-1-arm.7z",
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-4.0.0-1/rubyinstaller-4.0.0-1-x64.7z"
+  },
   "head": {
     "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-arm.7z",
     "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z"

windows.js

@@ -7,7 +7,6 @@ const path = require('path')
 const cp = require('child_process')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
-const tc = require('@actions/tool-cache')
 const common = require('./common')
 const rubyInstallerVersions = require('./windows-versions.json')
 const toolchainVersions = require('./windows-toolchain-versions.json')
@@ -81,7 +80,7 @@ export async function install(platform, engine, version) {
 async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
   const downloadPath = await common.measure('Downloading Ruby', async () => {
     console.log(url)
-    return await tc.downloadTool(url)
+    return await common.download(url)
   })
 
   const extractPath = process.env.RUNNER_TEMP
@@ -113,7 +112,7 @@ export async function installJRubyTools() {
 async function installMSYS2(url, rubyPrefix = process.env.RUNNER_TEMP) {
   const downloadPath = await common.measure('Downloading msys2 build tools', async () => {
     console.log(url)
-    return await tc.downloadTool(url)
+    return await common.download(url)
   })
 
   const extractPath = path.join(process.env.RUNNER_TEMP, 'msys64')
@@ -160,7 +159,7 @@ async function installMSYS1(url) {
 
   const downloadPath = await common.measure('Downloading msys1 build tools', async () => {
     console.log(url)
-    return await tc.downloadTool(url)
+    return await common.download(url)
   })
 
   const msys1Path = `${common.drive}:\\DevKit64`
@@ -196,7 +195,7 @@ async function installMSYS1(url) {
 async function installVCPKG(url) {
   const downloadPath = await common.measure('Downloading mswin vcpkg packages', async () => {
     console.log(url)
-    return await tc.downloadTool(url)
+    return await common.download(url)
   })
 
   const extractPath = process.env.VCPKG_INSTALLATION_ROOT

yarn.lock

@@ -283,9 +283,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -376,13 +376,14 @@ fast-xml-parser@^5.0.7:
     strnum "^2.1.0"
 
 form-data@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.3.tgz#f9bcf87418ce748513c0c3494bb48ec270c97acc"
-  integrity sha512-XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624"
+  integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
     es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
     mime-types "^2.1.35"
     safe-buffer "^5.2.1"