Add new RubyInstaller releases 4.0.1-1 and 3.2.10-1

... which is the default ruby version on Github Actions.

.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,100 +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-2019, windows-2022, windows-2025, windows-11-arm ]
+        include: ${{ fromJSON(needs.test-matrix.outputs.matrix) }}
-        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-2019, ruby: mingw }
-        - { os: windows-2019, ruby: mswin }
-        - { 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-2019, ruby: '1.9' }
-        - { 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-2019, ruby: truffleruby }
-        - { os: windows-2022, ruby: truffleruby }
-        - { os: windows-2025, ruby: truffleruby }
-        - { os: windows-11-arm, ruby: truffleruby }
-        - { os: windows-2019, ruby: truffleruby-head }
-        - { os: windows-2022, ruby: truffleruby-head }
-        - { os: windows-2025, ruby: truffleruby-head }
-        - { os: windows-11-arm, ruby: truffleruby-head }
-        - { os: windows-2019, ruby: truffleruby+graalvm }
-        - { os: windows-2022, ruby: truffleruby+graalvm }
-        - { os: windows-2025, ruby: truffleruby+graalvm }
-        - { os: windows-11-arm, ruby: truffleruby+graalvm }
-        - { os: windows-2019, ruby: truffleruby+graalvm-head }
-        - { os: windows-2022, ruby: truffleruby+graalvm-head }
-        - { os: windows-2025, ruby: truffleruby+graalvm-head }
-        - { os: windows-11-arm, ruby: truffleruby+graalvm-head }
-
     name: ${{ matrix.os }} ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - uses: ./
       with:
@@ -123,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')) {
@@ -134,7 +65,7 @@ jobs:
             echo 'ridk is unavailable'
           }
         } elseif ($plat.Contains('mswin')) {
-          &"$env:VCPKG_INSTALLATION_ROOT\vcpkg" list
+          Get-ChildItem "$env:VCPKG_INSTALLATION_ROOT\installed\vcpkg\info"
         }
     - name: RbConfig::CONFIG
       run: ruby -rrbconfig -rpp -e 'pp RbConfig::CONFIG'
@@ -164,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
@@ -189,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'
@@ -205,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: runner.os == 'Windows' && startsWith(matrix.ruby, 'jruby')
-      if: startsWith(matrix.os, 'windows') && 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"
@@ -222,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"
@@ -231,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"
@@ -240,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
@@ -262,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 }}
@@ -273,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'
@@ -284,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'
@@ -295,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'
@@ -307,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'
@@ -318,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'
@@ -329,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'
@@ -340,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'
@@ -364,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
@@ -376,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'
@@ -394,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'
@@ -427,10 +369,23 @@ jobs:
       - name: C:/msys64/mingw64/bin/gcc.exe not installed
         run: ruby -e "abort if File.exist?('C:/msys64/mingw64/bin/gcc.exe')"
 
-  lint:
+  validate-windows-versions:
+    name: "Check windows*versions.json are up-to-date"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: ./
+      with:
+        ruby-version: ruby
+    - run: ruby generate-windows-versions.rb
+    - name: Check generated files are up to date
+      run: git diff --exit-code
+
+  check-dist-index:
+    name: "Check dist/index.js is up-to-date"
     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 |
+| `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.0.1, head |
+| `jruby` | 9.1.17.0 - 10.0.2.0, head |
-| `truffleruby` | 19.3.0 - 24.2.1, head |
+| `truffleruby` | 19.3.0 - 33.0.0, head |
-| `truffleruby+graalvm` | 21.2.0 - 24.2.1, 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,13 +45,13 @@ 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-2019`, `windows-2022`, `windows-2025`, `windows-11-arm` |
+| Windows | `windows-2022`, `windows-2025`, `windows-11-arm` |
 
 Not all combinations of runner images and versions are supported.
 The list of available Ruby versions can be seen in [ruby-builder-versions.json](ruby-builder-versions.json) for Ubuntu and macOS
@@ -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.
@@ -243,7 +259,7 @@ It is recommended to first get your build working on Ubuntu and macOS before try
 * For Ruby < 2.4, the DevKit MSYS tools are installed and prepended to the `Path`.
 * Use JRuby 9.2.20+ on Windows (older versions have [bugs](https://github.com/ruby/setup-ruby/issues/18#issuecomment-889072695)).
 * JRuby on Windows has multiple issues ([jruby/jruby#7106](https://github.com/jruby/jruby/issues/7106), [jruby/jruby#7182](https://github.com/jruby/jruby/issues/7182)).
-* When compiling extension code, note that the packages required to build Ruby are included when using Windows 2022, but that Windows 2019 does not include all of them, and may require installing package(s).  This can be done with [setup-ruby-pkgs](https://github.com/ruby/setup-ruby-pkgs) or via MSYS2's pacman.  These packages may be required when installing or updating Ruby std-lib extension gems.
+* When compiling extension code, note that the packages required to build Ruby are included when using Windows 2022. Additional packages can be installed with [setup-ruby-pkgs](https://github.com/ruby/setup-ruby-pkgs) or via MSYS2's `pacman`. These packages may be required when installing or updating Ruby stdlib extension gems.
 
 ## Versioning
 

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}`)
+        console.log(`Using Bundler shipped with ${engine}-${rubyVersion}`)
-        return '2'
+        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
+  // Only use Bundler 4 on Ruby 3.2+
-  if (bundlerVersion.startsWith('2')) {
+  if (common.floatVersion(bundlerVersion) >= 4 && targetRubyVersion < 3.2) {
-    if (engine === 'ruby' && floatVersion <= 2.2) {
+    console.log('Bundler 4 requires Ruby 3.2+, using Bundler 2 instead on Ruby < 3.2')
-      console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.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'
@@ -137,18 +138,23 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
   }
 
   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
-  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`
 
-  await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint])
+  await exec.exec(gem, ['install', 'bundler', '-v', bundlerVersionConstraint])
 
   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')
@@ -156,10 +162,10 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
   }
 
   let envOptions = {}
-  if (bundlerVersion.startsWith('1') && common.isBundler2Default(engine, rubyVersion)) {
+  if (bundlerVersion.match(/^\d+/)) {
-    // If Bundler 1 is specified on Rubies which ship with Bundler 2,
+    // If a specific Bundler version is given or determined, we need to specify the version to use explicitly until the lockfile exists.
-    // we need to specify which Bundler 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 1 is 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 } }
   }
 
@@ -168,21 +174,22 @@ 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]
-  const baseKey = await computeBaseKey(platform, engine, rubyVersion, lockFile, cacheVersion)
+  const baseKey = await computeBaseKey(engine, rubyVersion, lockFile, cacheVersion)
   const key = `${baseKey}-${await common.hashFile(lockFile)}`
   // If only Gemfile.lock changes we can reuse part of the cache, and clean old gem versions below
   const restoreKeys = [`${baseKey}-`]
@@ -205,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'])
     }
@@ -232,7 +242,7 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
   return true
 }
 
-async function computeBaseKey(platform, engine, version, lockFile, cacheVersion) {
+async function computeBaseKey(engine, version, lockFile, cacheVersion) {
   const cwd = process.cwd()
   const bundleWith = process.env['BUNDLE_WITH'] || ''
   const bundleWithout = process.env['BUNDLE_WITHOUT'] || ''

common.js

@@ -12,10 +12,12 @@ 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['GITHUB_WORKSPACE'] || 'C')[0] : undefined)
+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
+  // 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', '3.4-asan'].includes(rubyVersion)
+  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)) {
@@ -175,7 +186,6 @@ const GitHubHostedPlatforms = [
   'ubuntu-22.04-arm64',
   'ubuntu-24.04-x64',
   'ubuntu-24.04-arm64',
-  'windows-2019-x64',
   'windows-2022-x64',
   'windows-2025-x64',
   'windows-11-arm64'
@@ -334,7 +344,7 @@ function engineToToolCacheName(engine) {
   }[engine]
 }
 
-export function getToolCacheRubyPrefix(platform, engine, version) {
+export function getToolCacheRubyPrefix(_platform, engine, version) {
   const toolCache = getToolCachePath()
   return path.join(toolCache, engineToToolCacheName(engine), version, os.arch())
 }
@@ -356,55 +366,29 @@ export function win2nix(path) {
   return path.replace(/\\/g, '/').replace(/ /g, '\\ ')
 }
 
-// JRuby is installed after setupPath is called, so folder doesn't exist
-function rubyIsUCRT(path) {
-  return !!(fs.existsSync(path) &&
-    fs.readdirSync(path, { withFileTypes: true }).find(dirent =>
-      dirent.isFile() && dirent.name.match(/^x64-(ucrt|vcruntime\d{3})-ruby\d{3}\.dll$/)))
-}
-
 export function setupPath(newPathEntries) {
-  let msys2Type = null
+  const originalPath = process.env[PATH_ENV_VAR].split(path.delimiter)
-  const envPath = windows ? 'Path' : 'PATH'
-  const originalPath = process.env[envPath].split(path.delimiter)
   let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
 
-  core.startGroup(`Modifying ${envPath}`)
+  core.group(`Modifying ${PATH_ENV_VAR}`, async () => {
-
+    // First remove the conflicting path entries
-  // First remove the conflicting path entries
+    if (cleanPath.length !== originalPath.length) {
-  if (cleanPath.length !== originalPath.length) {
+      console.log(`Entries removed from ${PATH_ENV_VAR} to avoid conflicts with default Ruby:`)
-    console.log(`Entries removed from ${envPath} to avoid conflicts with default Ruby:`)
+      for (const entry of originalPath) {
-    for (const entry of originalPath) {
+        if (!cleanPath.includes(entry)) {
-      if (!cleanPath.includes(entry)) {
+          console.log(`  ${entry}`)
-        console.log(`  ${entry}`)
+        }
       }
+      core.exportVariable(PATH_ENV_VAR, cleanPath.join(path.delimiter))
     }
-    core.exportVariable(envPath, cleanPath.join(path.delimiter))
-  }
 
-  // Then add new path entries using core.addPath()
+    console.log(`Entries added to ${PATH_ENV_VAR} to use selected Ruby:`)
-  let newPath
+    for (const entry of newPathEntries) {
-  const windowsToolchain = core.getInput('windows-toolchain')
+      console.log(`  ${entry}`)
-  if (windows && windowsToolchain !== 'none') {
+    }
-    // main Ruby dll determines whether mingw or ucrt build
+  })
-    msys2Type = os.arch() === 'arm64'
-      ? 'clangarm64'
-      : rubyIsUCRT(newPathEntries[0]) ? 'ucrt64' : 'mingw64'
 
-    // add MSYS2 in path for all Rubies on Windows, as it provides a better bash shell and a native toolchain
+  core.addPath(newPathEntries.join(path.delimiter))
-    const msys2 = [`C:\\msys64\\${msys2Type}\\bin`, 'C:\\msys64\\usr\\bin']
-    newPath = [...newPathEntries, ...msys2]
-  } else {
-    newPath = newPathEntries
-  }
-  console.log(`Entries added to ${envPath} to use selected Ruby:`)
-  for (const entry of newPath) {
-    console.log(`  ${entry}`)
-  }
-  core.endGroup()
-
-  core.addPath(newPath.join(path.delimiter))
-  return msys2Type
 }
 
 export async function setupJavaHome(rubyPrefix) {
@@ -421,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: } }))

generate-windows-versions.rb

@@ -1,11 +1,36 @@
-require 'net/http'
+require 'open-uri'
 require 'yaml'
 require 'json'
 
+# General rules:
+# - All the static parts of the expected URL are checked literally.
+# - Each path component must begin with [\w], or a more restrictive character set.
+# - Percent (`%`) shall not be allowed to avoid any percent encoding.
+WINDOWS_VERSIONS_URLS_REGEXPS = [
+  %r{\A#{Regexp.escape 'https://github.com/oneclick/rubyinstaller/releases/download'}/\w[\w.-]*/\w[\w.-]*\z},
+  %r{\A#{Regexp.escape 'https://github.com/oneclick/rubyinstaller2/releases/download'}/\w[\w.-]*/\w[\w.-]*\z},
+  %r{\A#{Regexp.escape 'https://github.com/MSP-Greg/ruby-loco/releases/download'}/\w[\w.-]*/\w[\w.-]*\z}
+].freeze
+
+WINDOWS_TOOLCHAIN_VERSIONS_URLS_REGEXPS = [
+  %r{\A#{Regexp.escape 'https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe'}\z},
+  %r{\A#{Regexp.escape 'https://github.com/ruby/setup-msys2-gcc/releases/download'}/\w[\w.-]*/\w[\w@.-]*\z},
+  %r{\A#{Regexp.escape 'https://github.com/ruby/setup-msys2-gcc/releases/latest/download'}/\w[\w@.-]*\z}
+].freeze
+
+# Validate all the URLs in the versions json
+def validate(versions, allowed_urls_regexps)
+  versions.values.flat_map(&:values).each do |url|
+    if allowed_urls_regexps.none? { |regexp| regexp.match? url.to_s }
+      raise SecurityError, "Unexpected URL: #{url}"
+    end
+  end
+end
+
 min_requirements = ['~> 2.0.0', '~> 2.1.9', '>= 2.2.6'].map { |req| Gem::Requirement.new(req) }
 
 url = 'https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml'
-entries = YAML.load(Net::HTTP.get(URI(url)), symbolize_names: true)
+entries = YAML.load(URI.open(url, &:read), symbolize_names: true)
 
 versions = entries.select { |entry|
   entry[:filetype] == 'rubyinstaller7z' and
@@ -31,18 +56,65 @@ versions = entries.select { |entry|
   min_requirements.any? { |req| req.satisfied_by?(Gem::Version.new(version)) }
 }.to_h
 
+latest_version = Gem::Version.new(versions.keys.last)
+head_version = Gem::Version.new("#{latest_version.bump}.0dev")
+
 versions['head'] = {
-  'arm64': 'https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-arm.7z',
+  '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'
+  'x64' => 'https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z'
 }
 versions['mingw'] = {
-  'x64': 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z'
+  'x64' => 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z'
 }
 versions['mswin'] = {
-  'x64': 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z'
+  'x64' => 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z'
 }
 versions['ucrt'] = {
-  'x64': 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-ucrt.7z'
+  'x64' => 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-ucrt.7z'
 }
 
+validate(versions, WINDOWS_VERSIONS_URLS_REGEXPS)
 File.binwrite 'windows-versions.json', "#{JSON.pretty_generate(versions)}\n"
+
+base_url = 'https://github.com/ruby/setup-msys2-gcc/releases/latest/download/windows-toolchain.json'
+windows_toolchain = JSON.parse(URI.open(base_url, &:read), symbolize_names: true)
+
+versions.each do |raw_version, archs|
+  version = Gem::Version.correct?(raw_version) ? Gem::Version.new(raw_version) : head_version
+
+  archs.each_key do |raw_arch|
+    arch = raw_arch == 'arm64' ? 'aarch64' : raw_arch
+
+    platform =
+      case raw_version
+      when 'head', 'ucrt'
+        "#{arch}-mingw-ucrt"
+      when 'mingw'
+        "#{arch}-mingw32"
+      when 'mswin'
+        "#{arch}-mswin64"
+      else
+        if version >= Gem::Version.new('3.1.0.dev')
+          "#{arch}-mingw-ucrt"
+        else
+          "#{arch}-mingw32"
+        end
+      end
+
+    toolchain =
+      windows_toolchain.select do |pkg|
+        pkg[:platform] == platform && pkg[:required_ruby_version].any? do |requirement|
+          Gem::Requirement.new(requirement).satisfied_by?(version)
+        end
+      end
+
+    unless toolchain.one?
+      raise "#{toolchain.empty? ? 'no' : 'multiple'} toolchains found for #{raw_version} #{raw_arch}: #{toolchain}"
+    end
+
+    archs[raw_arch] = URI.join(base_url, toolchain.first[:href])
+  end
+end
+
+validate(versions, WINDOWS_TOOLCHAIN_VERSIONS_URLS_REGEXPS)
+File.binwrite 'windows-toolchain-versions.json', "#{JSON.pretty_generate(versions)}\n"

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'])
 
@@ -70,13 +72,6 @@ export async function setupRuby(options = {}) {
   createGemRC(engine, version)
   envPreInstall()
 
-  // JRuby can use compiled extension code, so make sure gcc exists.
-  // As of Jan-2022, JRuby compiles against msvcrt.
-  if (platform.startsWith('windows') && engine === 'jruby' &&
-    !fs.existsSync('C:\\msys64\\mingw64\\bin\\gcc.exe')) {
-    await require('./windows').installJRubyTools()
-  }
-
   const rubyPrefix = await installer.install(platform, engine, version)
 
   await common.measure('Print Ruby version', async () =>
@@ -182,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/
 
@@ -195,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-15-intel, ruby: '2.4' }
-          - { os: macos-13, ruby: '2.5' }
+          - { 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')) {

package.json

@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "description": "Download a prebuilt Ruby and add it to the PATH in 5 seconds",
   "main": "index.js",
+  "license": "MIT",
   "scripts": {
     "package": "ncc build index.js -o dist"
   },
@@ -16,21 +17,20 @@
     "Ruby"
   ],
   "author": "Benoit Daloze",
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/ruby/setup-ruby/issues"
   },
   "homepage": "https://github.com/ruby/setup-ruby",
   "dependencies": {
-    "@actions/cache": "^4.0.0",
+    "@actions/cache": "^4.0.3",
     "@actions/core": "^1.11.1",
     "@actions/exec": "^1.1.1",
-    "@actions/io": "^1.1.2",
+    "@actions/io": "^1.1.3",
     "@actions/tool-cache": "^2",
     "linux-os-info": "^2.0.0",
-    "semver": "^7.3.7"
+    "semver": "^7.7.2"
   },
   "devDependencies": {
-    "@vercel/ncc": "^0.33.4"
+    "@vercel/ncc": "^0.38.3"
   }
 }

ruby-builder-versions.json

@@ -11,18 +11,19 @@
     "2.7.0", "2.7.1", "2.7.2", "2.7.3", "2.7.4", "2.7.5", "2.7.6", "2.7.7", "2.7.8",
     "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.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.2.10",
-    "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.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.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.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.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
@@ -46,8 +44,15 @@ export async function install(platform, engine, version) {
     rubyPrefix = path.join(os.homedir(), '.rubies', `${engine}-${version}`)
   }
 
+  const paths = [path.join(rubyPrefix, 'bin')]
+
+  // JRuby can use compiled extension code via ffi, so make sure gcc exists.
+  if (platform.startsWith('windows') && engine === 'jruby') {
+    paths.push(...await require('./windows').installJRubyTools())
+  }
+
   // Set the PATH now, so the MSYS2 'tar' is in Path on Windows
-  common.setupPath([path.join(rubyPrefix, 'bin')])
+  common.setupPath(paths)
 
   if (!inToolCache) {
     await io.mkdirP(rubyPrefix)
@@ -69,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}
@@ -98,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-${os.arch()}`
-      builderPlatform = 'windows-latest'
-    } else if (os.arch() === 'arm64') {
-      builderPlatform = 'windows-arm64'
-    }
   } else if (platform.startsWith('macos-')) {
-    if (os.arch() === 'x64') {
+    builderPlatform = `darwin-${os.arch()}`
-      builderPlatform = 'macos-latest'
-    } else if (os.arch() === 'arm64') {
-      builderPlatform = 'macos-13-arm64'
-    }
   } else if (platform.startsWith('ubuntu-')) {
-    if (os.arch() === 'x64') {
+    builderPlatform = `${platform}-${os.arch()}`
-      builderPlatform = platform
-    } else if (os.arch() === 'arm64') {
-      builderPlatform = `${platform}-arm64`
-    }
   }
 
-  if (builderPlatform === null) {
+  if (builderPlatform === null || !['x64', 'arm64'].includes(os.arch())) {
-    throw new Error(`Unknown download URL for platform ${platform}`)
+    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`
   }
 }
 

rubygems.js

@@ -39,8 +39,10 @@ async function rubygemsLatest(gem, platform, engine, rubyVersion) {
     const floatVersion = common.floatVersion(rubyVersion)
     if (common.isHeadVersion(rubyVersion)) {
       console.log('Ruby master builds use included RubyGems')
-    } else if (floatVersion >= 3.1) {
+    } else if (floatVersion >= 3.2) {
       await exec.exec(gem, ['update', '--system'])
+    } else if (floatVersion >= 3.1) {
+      await exec.exec(gem, ['update', '--system', '3.6.9'])
     } else if (floatVersion >= 3.0) {
       await exec.exec(gem, ['update', '--system', '3.5.23'])
     } else if (floatVersion >= 2.6) {

windows-toolchain-versions.json

@@ -0,0 +1,298 @@
+{
+  "2.0.0": {
+    "x64": "https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe"
+  },
+  "2.1.9": {
+    "x64": "https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe"
+  },
+  "2.2.6": {
+    "x64": "https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe"
+  },
+  "2.3.0": {
+    "x64": "https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe"
+  },
+  "2.3.1": {
+    "x64": "https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe"
+  },
+  "2.3.3": {
+    "x64": "https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe"
+  },
+  "2.4.1": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.4.2": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.4.3": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.4.4": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.4.5": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.4.6": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.4.7": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.4.9": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.4.10": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.5.0": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.5.1": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.5.3": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.5.5": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.5.6": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.5.7": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.5.8": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.5.9": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.0": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.1": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.2": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.3": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.4": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.5": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.6": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.7": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.8": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.9": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.6.10": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.0": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.1": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.2": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.3": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.4": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.5": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.6": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.7": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "2.7.8": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.0.0": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.0.1": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.0.2": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.0.3": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.0.4": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.0.5": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.0.6": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.0.7": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.1.0": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.1.1": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.1.2": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.1.3": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.1.4": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.1.5": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.1.6": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.1.7": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14-openssl@1.1.7z"
+  },
+  "3.2.0": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.1": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.2": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.3": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.4": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.5": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.6": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.7": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.8": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.2.9": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
+  },
+  "3.2.10": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
+  },
+  "3.3.0": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.3.1": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.3.2": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.3.3": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.3.4": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.3.5": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.3.6": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.3.7": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "3.3.8": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64-mingw-w64@r688-gcc@14.7z"
+  },
+  "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"
+  },
+  "3.4.2": {
+    "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"
+  },
+  "3.4.3": {
+    "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"
+  },
+  "3.4.4": {
+    "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.5": {
+    "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"
+  },
+  "4.0.1": {
+    "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"
+  },
+  "mingw": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-mingw64.7z"
+  },
+  "mswin": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/vcpkg-x64-windows.7z"
+  },
+  "ucrt": {
+    "x64": "https://github.com/ruby/setup-msys2-gcc/releases/latest/download/msys2-ucrt64.7z"
+  }
+}

windows-versions.json

@@ -203,6 +203,12 @@
   "3.2.8": {
     "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.8-1/rubyinstaller-3.2.8-1-x64.7z"
   },
+  "3.2.9": {
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.9-1/rubyinstaller-3.2.9-1-x64.7z"
+  },
+  "3.2.10": {
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.10-1/rubyinstaller-3.2.10-1-x64.7z"
+  },
   "3.3.0": {
     "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.0-1/rubyinstaller-3.3.0-1-x64.7z"
   },
@@ -230,6 +236,12 @@
   "3.3.8": {
     "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.8-1/rubyinstaller-3.3.8-1-x64.7z"
   },
+  "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"
@@ -242,6 +254,34 @@
     "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.3-1/rubyinstaller-3.4.3-1-arm.7z",
     "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.3-1/rubyinstaller-3.4.3-1-x64.7z"
   },
+  "3.4.4": {
+    "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.4-2/rubyinstaller-3.4.4-2-arm.7z",
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.4-2/rubyinstaller-3.4.4-2-x64.7z"
+  },
+  "3.4.5": {
+    "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"
+  },
+  "4.0.1": {
+    "arm64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-4.0.1-1/rubyinstaller-4.0.1-1-arm.7z",
+    "x64": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-4.0.1-1/rubyinstaller-4.0.1-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

@@ -1,42 +1,17 @@
 // 7z arguments
 //   -aoa overwrite existing, -bd disable progress indicator
 
-// OpenSSL version detection is needed in installGCCTools and installJRubyTools
-
 const fs = require('fs')
 const os = require('os')
 const path = require('path')
 const cp = require('child_process')
 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 rubyInstallerVersions = require('./windows-versions.json')
+const toolchainVersions = require('./windows-toolchain-versions.json')
 
-const drive = common.drive
+export function getAvailableVersions(_platform, engine) {
-
-const msys2GCCReleaseURI  = 'https://github.com/ruby/setup-msys2-gcc/releases/download'
-
-const msys2BasePath = process.env['GHCUP_MSYS2'] || 'C:\\msys64'
-const vcPkgBasePath = process.env['VCPKG_INSTALLATION_ROOT']
-
-// needed for Ruby 2.0-2.3, cert file used by Git for Windows
-const certFile = [
-  'C:\\Program Files\\Git\\mingw64\\etc\\ssl\\cert.pem',
-  'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem',
-  'C:\\Program Files\\Git\\clangarm64\\etc\\ssl\\cert.pem',
-  'C:\\Program Files\\Git\\clangarm64\\ssl\\cert.pem'
-].find(file => fs.existsSync(file))
-if (certFile === undefined) {
-  throw new Error("Cannot find Git's cert file")
-}
-
-// location & path for old RubyInstaller DevKit (MSYS1), used with Ruby 2.0-2.3
-const msys1 = `${drive}:\\DevKit64`
-const msysPathEntries = [`${msys1}\\mingw\\x86_64-w64-mingw32\\bin`, `${msys1}\\mingw\\bin`, `${msys1}\\bin`]
-
-export function getAvailableVersions(platform, engine) {
   if (engine === 'ruby') {
     return Object.keys(rubyInstallerVersions).filter(version => os.arch() in rubyInstallerVersions[version])
   } else {
@@ -47,14 +22,10 @@ export function getAvailableVersions(platform, engine) {
 export async function install(platform, engine, version) {
   const url = rubyInstallerVersions[version][os.arch()]
 
-  // The windows-2016 and windows-2019 images have MSYS2 build tools (C:/msys64/usr)
-  // and MinGW build tools installed.  The windows-2022 image has neither.
-  const hasMSYS2PreInstalled = ['windows-2019', 'windows-2016'].includes(platform)
-
   if (!url.endsWith('.7z')) {
     throw new Error(`URL should end in .7z: ${url}`)
   }
-  const base = url.slice(url.lastIndexOf('/') + 1, url.length - '.7z'.length)
+  const base = path.posix.basename(url, '.7z')
 
   let rubyPrefix, inToolCache
   if (common.shouldUseToolCache(engine, version)) {
@@ -65,121 +36,68 @@ export async function install(platform, engine, version) {
       rubyPrefix = common.getToolCacheRubyPrefix(platform, engine, version)
     }
   } else {
-    rubyPrefix = `${drive}:\\${base}`
+    rubyPrefix = `${common.drive}:\\${base}`
   }
 
   if (!inToolCache) {
     await downloadAndExtract(engine, version, url, base, rubyPrefix);
   }
 
+  const paths = [`${rubyPrefix}\\bin`]
   const windowsToolchain = core.getInput('windows-toolchain')
   if (windowsToolchain === 'none') {
-    common.setupPath([`${rubyPrefix}\\bin`])
+    common.setupPath(paths)
     return rubyPrefix
   }
 
-  let toolchainPaths = (version === 'mswin') ? await setupMSWin() : await setupMingw(version)
+  const toolchainUrl = toolchainVersions[version][os.arch()]
-  const msys2Type = common.setupPath([`${rubyPrefix}\\bin`, ...toolchainPaths])
 
-  // install msys2 tools for all Ruby versions, only install mingw or ucrt for Rubies >= 2.4
+  // Examples:
+  // - DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe
+  // - msys2-clangarm64.7z
+  // - vcpkg-x64-windows.7z
+  const toolchainName = path.posix.basename(toolchainUrl).split('-')[0].toLowerCase()
 
-  if (!hasMSYS2PreInstalled) {
+  if (toolchainName === 'msys2') {
-    await installMSYS2Tools()
+    paths.push(...await installMSYS2(toolchainUrl, rubyPrefix))
-  }
+  } else {
+    if (toolchainName === 'vcpkg') {
+      paths.push(...await installVCPKG(toolchainUrl))
+    } else if (toolchainName === 'devkit') {
+      paths.push(...await installMSYS1(toolchainUrl))
+    } else {
+      throw new Error(`Unknown toolchain type: ${toolchainUrl}`)
+    }
 
-  // windows 2016 and 2019 need ucrt64 installed, 2022 and future images need
+    // Install msys2 for other rubies to provide better command line tools
-  // ucrt64 or mingw64 installed, depending on Ruby version
+    paths.push(...await installMSYS2(toolchainVersions['head'][os.arch()]))
-  if ((msys2Type === 'ucrt64') || (common.floatVersion(version) >= 2.4)) {
-    await installGCCTools(msys2Type, version)
-  }
-
-  if (version === 'mswin') {
-    await installVCPkg()
-  }
-
-  const ridk = `${rubyPrefix}\\bin\\ridk.cmd`
-  if (fs.existsSync(ridk)) {
-    await common.measure('Adding ridk env variables', async () => addRidkEnv(ridk))
   }
 
+  common.setupPath(paths)
   return rubyPrefix
 }
 
-// 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, 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.  Note that the mswin archive uses OpenSSL 3.
-  // As of Jan-2023, OpenSSL 3 is used in Ruby 3.2 & all head versions.  MSYS2 updated
-  // to OpenSSL 3 on 14-Jan-2023.
-  let suffix = ''
-  if (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}${suffix} build tools`, async () =>
-    exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${msys2BasePath}`], { silent: true }))
-}
-
-// Actions windows-2022 image does not contain any MSYS2 build tools.  Install tools for it.
-// A subset of the MSYS2 base-devel group
-async function installMSYS2Tools() {
-  const downloadPath = await common.measure(`Downloading msys2 build tools`, async () => {
-    const suffix = os.arch() === 'arm64' ? '-arm64' : ''
-
-    let url = `${msys2GCCReleaseURI}/msys2-gcc-pkgs/msys2${suffix}.7z`
-    console.log(url)
-    return await tc.downloadTool(url)
-  })
-
-  // need to remove all directories, since they may indicate old packages are installed,
-  // otherwise, error of "error: duplicated database entry"
-  fs.rmSync(`${msys2BasePath}\\var\\lib\\pacman\\local`, { recursive: true, force: true })
-
-  await common.measure(`Extracting  msys2 build tools`, async () =>
-    exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${msys2BasePath}`], { silent: true }))
-}
-
-// Windows JRuby can install gems that require compile tools, only needed for
-// windows-2022 and later images
-export async function installJRubyTools() {
-  await installMSYS2Tools()
-  await installGCCTools(os.arch() === 'arm64' ? 'clangarm64' : 'mingw64', '3.4')
-}
-
-// Install vcpkg files needed to build mswin Ruby
-async function installVCPkg() {
-  const downloadPath = await common.measure(`Downloading mswin vcpkg packages`, async () => {
-    let url = `${msys2GCCReleaseURI}/msys2-gcc-pkgs/mswin.7z`
-    console.log(url)
-    return await tc.downloadTool(url)
-  })
-
-  await common.measure(`Extracting  mswin vcpkg packages`, async () =>
-    exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${vcPkgBasePath}`], { silent: true }))
-}
-
 async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
-  const parentDir = path.dirname(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
   await common.measure('Extracting  Ruby', async () =>
     // -xr extract but exclude share\doc files
-    exec.exec('7z', ['x', downloadPath, '-bd', `-xr!${base}\\share\\doc`, `-o${parentDir}`], { silent: true }))
+    exec.exec('7z', ['x', downloadPath, '-bd', `-xr!${base}\\share\\doc`, `-o${extractPath}`], { silent: true }))
 
-  if (base !== path.basename(rubyPrefix)) {
+  const parentDir = path.dirname(rubyPrefix)
-    await io.mv(path.join(parentDir, base), rubyPrefix)
+  if (!fs.existsSync(parentDir)) {
+    fs.mkdirSync(parentDir, { recursive: true })
+  }
+
+  const extractedPath = path.join(extractPath, base)
+  if (extractedPath[0] === rubyPrefix[0]) {
+    fs.renameSync(extractedPath, rubyPrefix)
+  } else {
+    fs.symlinkSync(extractedPath, rubyPrefix, 'junction')
   }
 
   if (common.shouldUseToolCache(engine, version)) {
@@ -187,108 +105,133 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
   }
 }
 
-async function setupMingw(version) {
+export async function installJRubyTools() {
-  core.exportVariable('MAKE', 'make.exe')
+  return await installMSYS2(toolchainVersions['head'][os.arch()])
-
-  // rename these to avoid confusion when Ruby is using OpenSSL 1.0.2.
-  // most current extconf files look for 1.1.x dll files first, which is the version of the renamed files
-  if (common.floatVersion(version) <= 2.4) {
-    renameSystem32Dlls()
-  }
-
-  if (common.floatVersion(version) <= 2.3) {
-    core.exportVariable('SSL_CERT_FILE', certFile)
-    await common.measure('Installing MSYS1', async () => installMSYS1(version))
-    return msysPathEntries
-  } else {
-    return []
-  }
 }
 
-// Ruby 2.0-2.3
+async function installMSYS2(url, rubyPrefix = process.env.RUNNER_TEMP) {
-async function installMSYS1(version) {
+  const downloadPath = await common.measure('Downloading msys2 build tools', async () => {
-  const url = 'https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe'
+    console.log(url)
-  const downloadPath = await tc.downloadTool(url)
+    return await common.download(url)
-  await exec.exec('7z', ['x', downloadPath, `-o${msys1}`], { silent: true })
+  })
 
-  // below are set in the old devkit.rb file ?
+  const extractPath = path.join(process.env.RUNNER_TEMP, 'msys64')
-  core.exportVariable('RI_DEVKIT', msys1)
+  await common.measure('Extracting  msys2 build tools', async () =>
-  core.exportVariable('CC' , 'gcc')
+    exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${extractPath}`], { silent: true }))
-  core.exportVariable('CXX', 'g++')
+
-  core.exportVariable('CPP', 'cpp')
+  // https://github.com/oneclick/rubyinstaller2/blob/HEAD/lib/ruby_installer/build/msys2_installation.rb
-  core.info(`Installed RubyInstaller DevKit for Ruby ${version}`)
+  //
+  // ri2 searches for msys64 in the following order:
+  // - ENV["MSYS2_PATH"]
+  // - File.join(RbConfig::TOPDIR, "msys64")
+  // - File.join(File.dirname(RbConfig::TOPDIR), "msys64")
+  // - "C:\msys64"
+  // - ...
+  //
+  // The first option ENV["MSYS2_PATH"] is only supported in ruby >=3.0.7.
+  // Therefore we use the second option to avoid conflict with existing "C:\msys64"
+  const msys2Path = path.join(rubyPrefix, 'msys64')
+  if (extractPath !== msys2Path) {
+    fs.symlinkSync(extractPath, msys2Path, 'junction')
+  }
+
+  const ridk = `${rubyPrefix}\\bin\\ridk.cmd`
+  if (fs.existsSync(ridk)) {
+    await common.measure('Setting up ridk environment', async () => exportCommandEnv(`set "MAKE=make" && "${ridk}" enable`))
+  }
+
+  // Examples:
+  // - msys2-clangarm64.7z
+  // - msys2-ucrt64-gcc@14.7z
+  // - msys2-mingw64-gcc@14-openssl@1.1.7z
+  const msys2Type = path.posix.basename(url).split(/[-.]/)[1]
+  return [`${msys2Path}\\${msys2Type}\\bin`, `${msys2Path}\\usr\\bin`]
 }
 
-async function setupMSWin() {
+async function installMSYS1(url) {
-  core.exportVariable('MAKE', 'nmake.exe')
+  const certFile = [
-  return await common.measure('Setting up MSVC environment', async () => addVCVARSEnv())
+    'C:\\Program Files\\Git\\mingw64\\etc\\ssl\\cert.pem',
+    'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem',
+  ].find(file => fs.existsSync(file))
+  if (certFile === undefined) {
+    throw new Error("Cannot find Git's cert file")
+  }
+
+  const downloadPath = await common.measure('Downloading msys1 build tools', async () => {
+    console.log(url)
+    return await common.download(url)
+  })
+
+  const msys1Path = `${common.drive}:\\DevKit64`
+  await common.measure('Extracting  msys1 build tools', async () =>
+    exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${msys1Path}`], { silent: true }))
+
+  await common.measure('Setting up DevKit environment', async () => {
+    // ssl dlls cause issues with msys1 Rubies
+    const sys32 = 'C:\\Windows\\System32\\'
+    const badFiles = [`${sys32}libcrypto-1_1-x64.dll`, `${sys32}libssl-1_1-x64.dll`]
+    const existing = badFiles.filter((dll) => fs.existsSync(dll))
+    if (existing.length > 0) {
+      core.warning(`Renaming ${existing.join(' and ')} to avoid dll resolution conflicts on Ruby < 2.4`)
+      existing.forEach(dll => fs.renameSync(dll, `${dll}_`))
+    }
+
+    exportEnv({
+      CC: 'gcc',
+      CPP: 'cpp',
+      CXX: 'g++',
+      MAKE: 'make',
+      RI_DEVKIT: msys1Path,
+      SSL_CERT_FILE: certFile
+    })
+  })
+
+  return [`${msys1Path}\\mingw\\x86_64-w64-mingw32\\bin`, `${msys1Path}\\mingw\\bin`, `${msys1Path}\\bin`]
 }
 
 /* Sets MSVC environment for use in Actions
  *   allows steps to run without running vcvars*.bat, also for PowerShell
- *   adds a convenience VCVARS environment variable
  *   this assumes a single Visual Studio version being available in the Windows images */
-export function addVCVARSEnv() {
+async function installVCPKG(url) {
-  let cmd = 'vswhere -latest -property installationPath'
+  const downloadPath = await common.measure('Downloading mswin vcpkg packages', async () => {
-  let vcVars = `${cp.execSync(cmd).toString().trim()}\\VC\\Auxiliary\\Build\\vcvars64.bat`
+    console.log(url)
-
+    return await common.download(url)
-  if (!fs.existsSync(vcVars)) {
-    throw new Error(`Missing vcVars file: ${vcVars}`)
-  }
-  core.exportVariable('VCVARS', vcVars)
-
-  cmd = `cmd.exe /c ""${vcVars}" && set"`
-
-  let newEnv = new Map()
-  let newSet = cp.execSync(cmd).toString().trim().split(/\r?\n/)
-  newSet = newSet.filter(line => /\S=\S/.test(line))
-  newSet.forEach(s => {
-    let [k,v] = common.partition(s, '=')
-    newEnv.set(k,v)
   })
 
-  let newPathEntries = undefined
+  const extractPath = process.env.VCPKG_INSTALLATION_ROOT
-  for (let [k, v] of newEnv) {
+  await common.measure('Extracting  mswin vcpkg packages', async () =>
-    if (process.env[k] !== v) {
+    exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${extractPath}`], { silent: true }))
-      if (/^Path$/i.test(k)) {
+
-        const newPathStr = v.replace(`${path.delimiter}${process.env['Path']}`, '')
+  return await common.measure('Setting up MSVC environment', async () => {
-        newPathEntries = newPathStr.split(path.delimiter)
+    const cmd = 'vswhere -latest -property installationPath'
-      } else {
+    const vcVarsBat = os.arch() === 'arm64' ? 'vcvarsarm64.bat' : 'vcvars64.bat'
-        core.exportVariable(k, v)
+    const vcVars = `${cp.execSync(cmd).toString().trim()}\\VC\\Auxiliary\\Build\\${vcVarsBat}`
-      }
+
+    if (!fs.existsSync(vcVars)) {
+      throw new Error(`Missing vcVars file: ${vcVars}`)
     }
-  }
-  return newPathEntries
-}
 
-// ssl files cause issues with non RI2 Rubies (<2.4) and ruby/ruby's CI from build folder due to dll resolution
+    return exportCommandEnv(`set "MAKE=nmake" && "${vcVars}"`)
-function renameSystem32Dlls() {
-  const sys32 = 'C:\\Windows\\System32\\'
-  const badFiles = [`${sys32}libcrypto-1_1-x64.dll`, `${sys32}libssl-1_1-x64.dll`]
-  const existing = badFiles.filter((dll) => fs.existsSync(dll))
-  if (existing.length > 0) {
-    console.log(`Renaming ${existing.join(' and ')} to avoid dll resolution conflicts on Ruby <= 2.4`)
-    existing.forEach(dll => fs.renameSync(dll, `${dll}_`))
-  }
-}
-
-// Sets MSYS2 ENV variables set from running `ridk enable`
-function addRidkEnv(ridk) {
-  let newEnv = new Map()
-  let cmd = `cmd.exe /c "${ridk} enable && set"`
-  let newSet = cp.execSync(cmd).toString().trim().split(/\r?\n/)
-  newSet = newSet.filter(line => /^\S+=\S+/.test(line))
-  newSet.forEach(s => {
-    let [k, v] = common.partition(s, '=')
-    newEnv.set(k, v)
   })
+}
 
-  for (let [k, v] of newEnv) {
+// Run a cmd command, export its environment, and return new paths
+function exportCommandEnv(command) {
+  const cmd = `cmd.exe /s /c "${command} >NUL && "${process.execPath}" -e console.log(JSON.stringify(process.env))"`
+  const env = JSON.parse(cp.execSync(cmd).toString())
+
+  const paths = env.Path.replace(`${path.delimiter}${process.env.Path}`, '').split(path.delimiter)
+  delete env.Path
+
+  exportEnv(env)
+  return paths
+}
+
+function exportEnv(env) {
+  for (const [k, v] of Object.entries(env)) {
     if (process.env[k] !== v) {
-      if (!/^Path$/i.test(k)) {
+      console.log(`${k}=${v}`)
-        console.log(`${k}=${v}`)
+      core.exportVariable(k, v)
-        core.exportVariable(k, v)
-      }
     }
   }
 }

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@actions/cache@^4.0.0":
+"@actions/cache@^4.0.3":
-  version "4.0.0"
+  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@actions/cache/-/cache-4.0.0.tgz#24845cced4326b11b6115fd3e2cff8e7ea3afed2"
+  resolved "https://registry.yarnpkg.com/@actions/cache/-/cache-4.0.3.tgz#7b08ede6ae2c0b2fb0b7b452ed0f40ba9f0c53d3"
-  integrity sha512-WIuxjnZ44lNYtIS4fqSaYvF00hORdy3cSin+jx8xNgBVGWnNIAiCBHjlwusVQlcgExoQC9pHXGrDsZyZr7rCDQ==
+  integrity sha512-SvrqFtYJ7I48A/uXNkoJrnukx5weQv1fGquhs3+4nkByZThBH109KTIqj5x/cGV7JGNvb8dLPVywUOqX1fjiXg==
   dependencies:
     "@actions/core" "^1.11.1"
     "@actions/exec" "^1.0.1"
@@ -17,7 +17,6 @@
     "@azure/storage-blob" "^12.13.0"
     "@protobuf-ts/plugin" "^2.9.4"
     semver "^6.3.1"
-    twirp-ts "^2.5.0"
 
 "@actions/core@^1.11.1", "@actions/core@^1.2.6":
   version "1.11.1"
@@ -43,104 +42,135 @@
     minimatch "^3.0.4"
 
 "@actions/http-client@^2.0.1", "@actions/http-client@^2.1.1":
-  version "2.1.1"
+  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.1.1.tgz#a8e97699c315bed0ecaeaaeb640948470d4586a0"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.2.3.tgz#31fc0b25c0e665754ed39a9f19a8611fc6dab674"
-  integrity sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==
+  integrity sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==
   dependencies:
     tunnel "^0.0.6"
+    undici "^5.25.4"
 
-"@actions/io@^1.0.1", "@actions/io@^1.1.1", "@actions/io@^1.1.2":
+"@actions/io@^1.0.1", "@actions/io@^1.1.1", "@actions/io@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.3.tgz#4cdb6254da7962b07473ff5c335f3da485d94d71"
   integrity sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==
 
 "@actions/tool-cache@^2":
-  version "2.0.1"
+  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-2.0.1.tgz#8a649b9c07838d9d750c9864814e66a7660ab720"
+  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-2.0.2.tgz#49ff20b0352aeac5411988e88435e47144fabb3e"
-  integrity sha512-iPU+mNwrbA8jodY8eyo/0S/QqCKDajiR8OxWTnSk/SnYg0sj8Hp4QcUEVC1YFpHWXtrfbQrE13Jz4k4HXJQKcA==
+  integrity sha512-fBhNNOWxuoLxztQebpOaWu6WeVmuwa77Z+DxIZ1B+OYvGkGQon6kTVg6Z32Cb13WCuw0szqonK+hh03mJV7Z6w==
   dependencies:
-    "@actions/core" "^1.2.6"
+    "@actions/core" "^1.11.1"
     "@actions/exec" "^1.0.0"
     "@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.1.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==
   dependencies:
     tslib "^2.2.0"
 
-"@azure/core-auth@^1.1.4", "@azure/core-auth@^1.3.0":
+"@azure/abort-controller@^2.0.0", "@azure/abort-controller@^2.1.2":
-  version "1.5.0"
+  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.5.0.tgz#a41848c5c31cb3b7c84c409885267d55a2c92e44"
+  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-2.1.2.tgz#42fe0ccab23841d9905812c58f1082d27784566d"
-  integrity sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==
+  integrity sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==
   dependencies:
-    "@azure/abort-controller" "^1.0.0"
+    tslib "^2.6.2"
-    "@azure/core-util" "^1.1.0"
-    tslib "^2.2.0"
 
-"@azure/core-http@^3.0.0":
+"@azure/core-auth@^1.1.4", "@azure/core-auth@^1.4.0", "@azure/core-auth@^1.8.0":
-  version "3.0.3"
+  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-3.0.3.tgz#792c0af7d8ebec7d34a99bbd7108aa370cd49948"
+  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.9.0.tgz#ac725b03fabe3c892371065ee9e2041bee0fd1ac"
-  integrity sha512-QMib3wXotJMFhHgmJBPUF9YsyErw34H0XDFQd9CauH7TPB+RGcyl9Ayy7iURtJB04ngXhE6YwrQsWDXlSLrilg==
+  integrity sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==
   dependencies:
-    "@azure/abort-controller" "^1.0.0"
+    "@azure/abort-controller" "^2.0.0"
-    "@azure/core-auth" "^1.3.0"
+    "@azure/core-util" "^1.11.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
+    tslib "^2.6.2"
-    "@azure/core-util" "^1.1.1"
+
+"@azure/core-client@^1.3.0", "@azure/core-client@^1.6.2":
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.9.4.tgz#bb9bb85edc780fc65630b6d8ffa172c3633ca8fe"
+  integrity sha512-f7IxTD15Qdux30s2qFARH+JxgwxWLG2Rlr4oSkPGuLWm+1p5y1+C04XGLA0vmX6EtqfutmjvpNmAfgwVIS5hpw==
+  dependencies:
+    "@azure/abort-controller" "^2.0.0"
+    "@azure/core-auth" "^1.4.0"
+    "@azure/core-rest-pipeline" "^1.20.0"
+    "@azure/core-tracing" "^1.0.0"
+    "@azure/core-util" "^1.6.1"
     "@azure/logger" "^1.0.0"
-    "@types/node-fetch" "^2.5.0"
+    tslib "^2.6.2"
-    "@types/tunnel" "^0.0.3"
+
-    form-data "^4.0.0"
+"@azure/core-http-compat@^2.0.0":
-    node-fetch "^2.6.7"
+  version "2.3.0"
-    process "^0.11.10"
+  resolved "https://registry.yarnpkg.com/@azure/core-http-compat/-/core-http-compat-2.3.0.tgz#e9d396299211e742308827674082c13bd638c6bf"
-    tslib "^2.2.0"
+  integrity sha512-qLQujmUypBBG0gxHd0j6/Jdmul6ttl24c8WGiLXIk7IHXdBlfoBqW27hyz3Xn6xbfdyVSarl1Ttbk0AwnZBYCw==
-    tunnel "^0.0.6"
+  dependencies:
-    uuid "^8.3.0"
+    "@azure/abort-controller" "^2.0.0"
-    xml2js "^0.5.0"
+    "@azure/core-client" "^1.3.0"
+    "@azure/core-rest-pipeline" "^1.20.0"
 
 "@azure/core-lro@^2.2.0":
-  version "2.5.4"
+  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.5.4.tgz#b21e2bcb8bd9a8a652ff85b61adeea51a8055f90"
+  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.7.2.tgz#787105027a20e45c77651a98b01a4d3b01b75a08"
-  integrity sha512-3GJiMVH7/10bulzOKGrrLeG/uCBH/9VtxqaMcB9lIqAeamI/xYQSHJL/KcsLDuH+yTjYpro/u6D/MuRe4dN70Q==
+  integrity sha512-0YIpccoX8m/k00O7mDDMdJpbr6mf1yWo2dfmxt5A8XVZVVMz2SSKaEbMCeJRvgQ0IaSlqhjT47p4hVIRRy90xw==
   dependencies:
-    "@azure/abort-controller" "^1.0.0"
+    "@azure/abort-controller" "^2.0.0"
     "@azure/core-util" "^1.2.0"
     "@azure/logger" "^1.0.0"
-    tslib "^2.2.0"
+    tslib "^2.6.2"
 
 "@azure/core-paging@^1.1.1":
-  version "1.5.0"
+  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.5.0.tgz#5a5b09353e636072e6a7fc38f7879e11d0afb15f"
+  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.6.2.tgz#40d3860dc2df7f291d66350b2cfd9171526433e7"
-  integrity sha512-zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw==
+  integrity sha512-YKWi9YuCU04B55h25cnOYZHxXYtEvQEbKST5vqRga7hWY9ydd3FZHdeQF8pyh+acWZvppw13M/LMGx0LABUVMA==
   dependencies:
-    tslib "^2.2.0"
+    tslib "^2.6.2"
 
-"@azure/core-tracing@1.0.0-preview.13":
+"@azure/core-rest-pipeline@^1.10.1", "@azure/core-rest-pipeline@^1.20.0":
-  version "1.0.0-preview.13"
+  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
+  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.20.0.tgz#916d8d6c9cff6b556f0b0bfd5b923526d590e2d9"
-  integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
+  integrity sha512-ASoP8uqZBS3H/8N8at/XwFr6vYrRP3syTK0EUjDXQy0Y1/AUS+QeIRThKmTNJO2RggvBBxaXDPM7YoIwDGeA0g==
   dependencies:
-    "@opentelemetry/api" "^1.0.1"
+    "@azure/abort-controller" "^2.0.0"
-    tslib "^2.2.0"
+    "@azure/core-auth" "^1.8.0"
+    "@azure/core-tracing" "^1.0.1"
+    "@azure/core-util" "^1.11.0"
+    "@azure/logger" "^1.0.0"
+    "@typespec/ts-http-runtime" "^0.2.2"
+    tslib "^2.6.2"
 
-"@azure/core-util@^1.1.0", "@azure/core-util@^1.1.1", "@azure/core-util@^1.2.0":
+"@azure/core-tracing@^1.0.0", "@azure/core-tracing@^1.0.1", "@azure/core-tracing@^1.1.2":
-  version "1.4.0"
+  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.4.0.tgz#c120a56b3e48a9e4d20619a0b00268ae9de891c7"
+  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.2.0.tgz#7be5d53c3522d639cf19042cbcdb19f71bc35ab2"
-  integrity sha512-eGAyJpm3skVQoLiRqm/xPa+SXi/NPDdSHMxbRAz2lSprd+Zs+qrpQGQQ2VQ3Nttu+nSZR4XoYQC71LbEI7jsig==
+  integrity sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==
   dependencies:
-    "@azure/abort-controller" "^1.0.0"
+    tslib "^2.6.2"
-    tslib "^2.2.0"
+
+"@azure/core-util@^1.11.0", "@azure/core-util@^1.2.0", "@azure/core-util@^1.6.1":
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.12.0.tgz#0b8c2837e6d67c3fbaeae20df34cf07f66b3480d"
+  integrity sha512-13IyjTQgABPARvG90+N2dXpC+hwp466XCdQXPCRlbWHgd3SJd5Q1VvaBGv6k1BIa4MQm6hAF1UBU1m8QUxV8sQ==
+  dependencies:
+    "@azure/abort-controller" "^2.0.0"
+    "@typespec/ts-http-runtime" "^0.2.2"
+    tslib "^2.6.2"
+
+"@azure/core-xml@^1.4.3":
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/@azure/core-xml/-/core-xml-1.4.5.tgz#6ebffa860799cb657f0ca63a5992d359d4aa4b2d"
+  integrity sha512-gT4H8mTaSXRz7eGTuQyq1aIJnJqeXzpOe9Ay7Z3FrCouer14CbV3VzjnJrNrQfbBpGBLO9oy8BmrY75A0p53cA==
+  dependencies:
+    fast-xml-parser "^5.0.7"
+    tslib "^2.8.1"
 
 "@azure/logger@^1.0.0":
-  version "1.0.4"
+  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.4.tgz#28bc6d0e5b3c38ef29296b32d35da4e483593fa1"
+  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.2.0.tgz#a79aefcdd57d2a96603fab59c9a66e0d9022a564"
-  integrity sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==
+  integrity sha512-0hKEzLhpw+ZTAfNJyRrn6s+V0nDWzXk9OjBr2TiGIu0OfMr5s2V4FpKLTAK3Ca5r5OKLbf4hkOGDPyiRjie/jA==
   dependencies:
-    tslib "^2.2.0"
+    "@typespec/ts-http-runtime" "^0.2.2"
+    tslib "^2.6.2"
 
 "@azure/ms-rest-js@^2.6.0":
   version "2.7.0"
@@ -157,84 +187,78 @@
     xml2js "^0.5.0"
 
 "@azure/storage-blob@^12.13.0":
-  version "12.16.0"
+  version "12.27.0"
-  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.16.0.tgz#c41fb1e538d6f6e2a6756bfcc69382eededf4fa1"
+  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.27.0.tgz#3062930411173a28468bd380e0ad2c6328d7288a"
-  integrity sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q==
+  integrity sha512-IQjj9RIzAKatmNca3D6bT0qJ+Pkox1WZGOg2esJF2YLHb45pQKOwGPIAV+w3rfgkj7zV3RMxpn/c6iftzSOZJQ==
   dependencies:
-    "@azure/abort-controller" "^1.0.0"
+    "@azure/abort-controller" "^2.1.2"
-    "@azure/core-http" "^3.0.0"
+    "@azure/core-auth" "^1.4.0"
+    "@azure/core-client" "^1.6.2"
+    "@azure/core-http-compat" "^2.0.0"
     "@azure/core-lro" "^2.2.0"
     "@azure/core-paging" "^1.1.1"
-    "@azure/core-tracing" "1.0.0-preview.13"
+    "@azure/core-rest-pipeline" "^1.10.1"
+    "@azure/core-tracing" "^1.1.2"
+    "@azure/core-util" "^1.6.1"
+    "@azure/core-xml" "^1.4.3"
     "@azure/logger" "^1.0.0"
     events "^3.0.0"
     tslib "^2.2.0"
 
-"@opentelemetry/api@^1.0.1":
+"@fastify/busboy@^2.0.0":
-  version "1.6.0"
+  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.6.0.tgz#de2c6823203d6f319511898bb5de7e70f5267e19"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
-  integrity sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==
+  integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
 
-"@protobuf-ts/plugin-framework@^2.0.7", "@protobuf-ts/plugin-framework@^2.9.4":
+"@protobuf-ts/plugin-framework@^2.10.0":
-  version "2.9.4"
+  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@protobuf-ts/plugin-framework/-/plugin-framework-2.9.4.tgz#d7a617dedda4a12c568fdc1db5aa67d5e4da2406"
+  resolved "https://registry.yarnpkg.com/@protobuf-ts/plugin-framework/-/plugin-framework-2.10.0.tgz#e716a4b7fdb8710527101d145a000e254731abbb"
-  integrity sha512-9nuX1kjdMliv+Pes8dQCKyVhjKgNNfwxVHg+tx3fLXSfZZRcUHMc1PMwB9/vTvc6gBKt9QGz5ERqSqZc0++E9A==
+  integrity sha512-EuW9irbt+w7Ml1CaAxK6xyl7pSuWVbNy0rsChxJEthMrAVTN5EPdJ3whNWvsRBa+HwRImEl8KHNnRoq/vGOHbg==
   dependencies:
-    "@protobuf-ts/runtime" "^2.9.4"
+    "@protobuf-ts/runtime" "^2.10.0"
     typescript "^3.9"
 
 "@protobuf-ts/plugin@^2.9.4":
-  version "2.9.4"
+  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@protobuf-ts/plugin/-/plugin-2.9.4.tgz#4e593e59013aaad313e7abbabe6e61964ef0ca28"
+  resolved "https://registry.yarnpkg.com/@protobuf-ts/plugin/-/plugin-2.10.0.tgz#dc91af30aeecf2a9debe2d0abf5b2a07a25156c5"
-  integrity sha512-Db5Laq5T3mc6ERZvhIhkj1rn57/p8gbWiCKxQWbZBBl20wMuqKoHbRw4tuD7FyXi+IkwTToaNVXymv5CY3E8Rw==
+  integrity sha512-iMX4C4TVfMNRLn2msK0cVg5jmizjtu5FYiy8EK5Lg6EgyR9TVHeK2rzmufWKYM2Pcg1jSwC0cFcXHQnCoeFxUg==
   dependencies:
-    "@protobuf-ts/plugin-framework" "^2.9.4"
+    "@protobuf-ts/plugin-framework" "^2.10.0"
-    "@protobuf-ts/protoc" "^2.9.4"
+    "@protobuf-ts/protoc" "^2.10.0"
-    "@protobuf-ts/runtime" "^2.9.4"
+    "@protobuf-ts/runtime" "^2.10.0"
-    "@protobuf-ts/runtime-rpc" "^2.9.4"
+    "@protobuf-ts/runtime-rpc" "^2.10.0"
     typescript "^3.9"
 
-"@protobuf-ts/protoc@^2.9.4":
+"@protobuf-ts/protoc@^2.10.0":
-  version "2.9.4"
+  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@protobuf-ts/protoc/-/protoc-2.9.4.tgz#a92262ee64d252998540238701d2140f4ffec081"
+  resolved "https://registry.yarnpkg.com/@protobuf-ts/protoc/-/protoc-2.10.0.tgz#4a280ead9d5b143b6ef863339980050184bcac49"
-  integrity sha512-hQX+nOhFtrA+YdAXsXEDrLoGJqXHpgv4+BueYF0S9hy/Jq0VRTVlJS1Etmf4qlMt/WdigEes5LOd/LDzui4GIQ==
+  integrity sha512-S4BtGBh22+uL5E6qLVxV0QNY6tiLVB8QL7RIkvo+KYknipZfSNwubdKy5CPkrwVXzJn4s3cx7bKx1w6BxkBIPg==
 
-"@protobuf-ts/runtime-rpc@^2.9.4":
+"@protobuf-ts/runtime-rpc@^2.10.0":
-  version "2.9.4"
+  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.9.4.tgz#d6ab2316c0ba67ce5a08863bb23203a837ff2a3b"
+  resolved "https://registry.yarnpkg.com/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.10.0.tgz#68de8dcc369e56579569a4deafd394cf4683dc66"
-  integrity sha512-y9L9JgnZxXFqH5vD4d7j9duWvIJ7AShyBRoNKJGhu9Q27qIbchfzli66H9RvrQNIFk5ER7z1Twe059WZGqERcA==
+  integrity sha512-8CS/XPv3+pMK4v8UKhtCdvbS4h9l7aqlteKdRt0/UbIKZ8n0qHj6hX8cBhz2ngvohxCOS0N08zPr9aCLBNhW3Q==
   dependencies:
-    "@protobuf-ts/runtime" "^2.9.4"
+    "@protobuf-ts/runtime" "^2.10.0"
 
-"@protobuf-ts/runtime@^2.9.4":
+"@protobuf-ts/runtime@^2.10.0":
-  version "2.9.4"
+  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@protobuf-ts/runtime/-/runtime-2.9.4.tgz#db8a78b1c409e26d258ca39464f4757d804add8f"
+  resolved "https://registry.yarnpkg.com/@protobuf-ts/runtime/-/runtime-2.10.0.tgz#bc90f632647ff2ae72887546ddf3d193f3f43d98"
-  integrity sha512-vHRFWtJJB/SiogWDF0ypoKfRIZ41Kq+G9cEFj6Qm1eQaAhJ1LDFvgZ7Ja4tb3iLOQhz0PaoPnnOijF1qmEqTxg==
+  integrity sha512-ypYwGg9Pn3W/2lZ7/HW60hONGuSdzphvOY8Dq7LeNttymDe0y3LaTUUMRpuGqOT6FfrWEMnfQbyqU8AAreo8wA==
 
-"@types/node-fetch@^2.5.0":
+"@typespec/ts-http-runtime@^0.2.2":
-  version "2.6.5"
+  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.5.tgz#972756a9a0fe354b2886bf3defe667ddb4f0d30a"
+  resolved "https://registry.yarnpkg.com/@typespec/ts-http-runtime/-/ts-http-runtime-0.2.2.tgz#a0c7458ed99aae6d7eb22efc17a839cec0b4a1b3"
-  integrity sha512-OZsUlr2nxvkqUFLSaY2ZbA+P1q22q+KrlxWOn/38RX+u5kTkYL2mTujEpzUhGkS+K/QCYp9oagfXG39XOzyySg==
+  integrity sha512-Gz/Sm64+Sq/vklJu1tt9t+4R2lvnud8NbTD/ZfpZtMiUX7YeVpCA8j6NSW8ptwcoLL+NmYANwqP8DV0q/bwl2w==
   dependencies:
-    "@types/node" "*"
+    http-proxy-agent "^7.0.0"
-    form-data "^4.0.0"
+    https-proxy-agent "^7.0.0"
+    tslib "^2.6.2"
 
-"@types/node@*":
+"@vercel/ncc@^0.38.3":
-  version "20.6.2"
+  version "0.38.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.2.tgz#a065925409f59657022e9063275cd0b9bd7e1b12"
+  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.38.3.tgz#5475eeee3ac0f1a439f237596911525a490a88b5"
-  integrity sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==
+  integrity sha512-rnK6hJBS6mwc+Bkab+PGPs9OiS0i/3kdTO+CkI8V0/VrW3vmz7O2Pxjw/owOlmo6PKEIxRSeZKv/kuL9itnpYA==
-
-"@types/tunnel@^0.0.3":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
-  integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==
-  dependencies:
-    "@types/node" "*"
-
-"@vercel/ncc@^0.33.4":
-  version "0.33.4"
-  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.33.4.tgz#e44a87511f583b7ba88e4b9ae90eeb7ba252b872"
-  integrity sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==
 
 abort-controller@^3.0.0:
   version "3.0.0"
@@ -243,6 +267,11 @@ abort-controller@^3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
+agent-base@^7.1.0, agent-base@^7.1.2:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1"
+  integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -254,50 +283,80 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
+  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-camel-case@^4.1.2:
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
-  version "4.1.2"
+  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
   dependencies:
-    pascal-case "^3.1.2"
+    es-errors "^1.3.0"
-    tslib "^2.0.3"
+    function-bind "^1.1.2"
 
-combined-stream@^1.0.6, combined-stream@^1.0.8:
+combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
-  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+debug@4, debug@^4.3.4:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
+  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
+  dependencies:
+    ms "^2.1.3"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-dot-object@^2.1.4:
+dunder-proto@^1.0.1:
-  version "2.1.5"
+  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dot-object/-/dot-object-2.1.5.tgz#0ff0f1bff42c47ff06272081b208658c0a0231c2"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-  integrity sha512-xHF8EP4XH/Ba9fvAF2LDd5O3IITVolerVV6xvkxoM8zlGEiCUrggpAnHyOoKJKCrhvPcGATFAUwIujj7bRG5UA==
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
   dependencies:
-    commander "^6.1.0"
+    call-bind-apply-helpers "^1.0.1"
-    glob "^7.1.6"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
+es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+  dependencies:
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+  dependencies:
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
 
 event-target-shim@^5.0.0:
   version "5.0.1"
@@ -309,104 +368,127 @@ events@^3.0.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-form-data@^2.5.0:
+fast-xml-parser@^5.0.7:
-  version "2.5.1"
+  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.3.tgz#cd6d353998857313b92c7fba5e5d8a66802b0111"
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+  integrity sha512-OdCYfRqfpuLUFonTNjvd30rCBZUneHpSQkCqfaeWQ9qrKcl6XlWeDBNVwGb+INAIxRshuN2jF+BE0L6gbBO2mw==
   dependencies:
-    asynckit "^0.4.0"
+    strnum "^2.1.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
 
-form-data@^4.0.0:
+form-data@^2.5.0:
-  version "4.0.0"
+  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
-    mime-types "^2.1.12"
+    es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
+    mime-types "^2.1.35"
+    safe-buffer "^5.2.1"
 
-fs.realpath@^1.0.0:
+function-bind@^1.1.2:
-  version "1.0.0"
+  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-glob@^7.1.6:
+get-intrinsic@^1.2.6:
-  version "7.2.3"
+  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
   dependencies:
-    fs.realpath "^1.0.0"
+    call-bind-apply-helpers "^1.0.2"
-    inflight "^1.0.4"
+    es-define-property "^1.0.1"
-    inherits "2"
+    es-errors "^1.3.0"
-    minimatch "^3.1.1"
+    es-object-atoms "^1.1.1"
-    once "^1.3.0"
+    function-bind "^1.1.2"
-    path-is-absolute "^1.0.0"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
 
-inflight@^1.0.4:
+get-proto@^1.0.1:
-  version "1.0.6"
+  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
   dependencies:
-    once "^1.3.0"
+    dunder-proto "^1.0.1"
-    wrappy "1"
+    es-object-atoms "^1.0.0"
 
-inherits@2:
+gopd@^1.2.0:
-  version "2.0.4"
+  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
+
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
+
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
+
+hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
+http-proxy-agent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
+https-proxy-agent@^7.0.0:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
+  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
+  dependencies:
+    agent-base "^7.1.2"
+    debug "4"
 
 linux-os-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/linux-os-info/-/linux-os-info-2.0.0.tgz#32a251077c13af1a69dbcb36a168901208e32776"
   integrity sha512-ZopyH4kT2Ehnmix8iUgS/41pfv7fSlUV1JukIn3DB3qD3byvhBNtgCbUApoAtiqcHRLKXCY3zakXlJgiExm2Qg==
 
-lodash@^4.17.15:
+math-intrinsics@^1.1.0:
-  version "4.17.21"
+  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
-
-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
-  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
-  dependencies:
-    tslib "^2.0.3"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
 
 mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.35:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
-minimatch@^3.0.4, minimatch@^3.1.1:
+minimatch@^3.0.4:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
-no-case@^3.0.4:
+ms@^2.1.3:
-  version "3.0.4"
+  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-  dependencies:
-    lower-case "^2.0.2"
-    tslib "^2.0.3"
 
 node-fetch@^2.6.7:
   version "2.7.0"
@@ -415,114 +497,64 @@ node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-once@^1.3.0:
+safe-buffer@^5.2.1:
-  version "1.4.0"
+  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-  dependencies:
-    wrappy "1"
-
-pascal-case@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
-  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-to-regexp@^6.2.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.3.0.tgz#2b6a26a337737a8e1416f9272ed0766b1c0389f4"
-  integrity sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==
-
-prettier@^2.5.1:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
-  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
 sax@>=0.6.0:
-  version "1.2.4"
+  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+  integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
 
 semver@^6.1.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.7:
+semver@^7.7.2:
-  version "7.5.4"
+  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
-  dependencies:
+
-    lru-cache "^6.0.0"
+strnum@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.1.1.tgz#cf2a6e0cf903728b8b2c4b971b7e36b4e82d46ab"
+  integrity sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==
 
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
-ts-poet@^4.5.0:
-  version "4.15.0"
-  resolved "https://registry.yarnpkg.com/ts-poet/-/ts-poet-4.15.0.tgz#637145fa554d3b27c56541578df0ce08cd9eb328"
-  integrity sha512-sLLR8yQBvHzi9d4R1F4pd+AzQxBfzOSSjfxiJxQhkUoH5bL7RsAC6wgvtVUQdGqiCsyS9rT6/8X2FI7ipdir5g==
-  dependencies:
-    lodash "^4.17.15"
-    prettier "^2.5.1"
-
 tslib@^1.10.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3:
+tslib@^2.2.0, tslib@^2.6.2, tslib@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
-tslib@^2.2.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
-
 tunnel@0.0.6, tunnel@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
   integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
 
-twirp-ts@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/twirp-ts/-/twirp-ts-2.5.0.tgz#b43f09e95868d68ecd5c755ecbb08a7e51388504"
-  integrity sha512-JTKIK5Pf/+3qCrmYDFlqcPPUx+ohEWKBaZy8GL8TmvV2VvC0SXVyNYILO39+GCRbqnuP6hBIF+BVr8ZxRz+6fw==
-  dependencies:
-    "@protobuf-ts/plugin-framework" "^2.0.7"
-    camel-case "^4.1.2"
-    dot-object "^2.1.4"
-    path-to-regexp "^6.2.0"
-    ts-poet "^4.5.0"
-    yaml "^1.10.2"
-
 typescript@^3.9:
   version "3.9.10"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
   integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
 
-uuid@^3.3.2:
+undici@^5.25.4:
-  version "3.4.0"
+  version "5.29.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.29.0.tgz#419595449ae3f2cdcba3580a2e8903399bd1f5a3"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+  integrity sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==
+  dependencies:
+    "@fastify/busboy" "^2.0.0"
 
-uuid@^8.3.0, uuid@^8.3.2:
+uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -540,11 +572,6 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
 xml2js@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
@@ -557,13 +584,3 @@ xmlbuilder@~11.0.0:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yaml@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==