Update CRuby releases on Windows

* See https://github.com/ruby/setup-ruby/issues/543

.github/workflows/test.yml

@@ -41,11 +41,6 @@ jobs:
         - { os: macos-arm-oss, ruby: '2.3' }
         - { os: macos-arm-oss, ruby: '2.4' }
         - { os: macos-arm-oss, ruby: '2.5' }
-        # Fails to compile on macos-arm-oss, https://github.com/ruby/setup-ruby/pull/494#issuecomment-1758099885
-        - { os: macos-arm-oss, ruby: '3.1' }
-        # No Java available yet on macos-arm-oss images
-        - { os: macos-arm-oss, ruby: 'jruby' }
-        - { os: macos-arm-oss, ruby: 'jruby-head' }
         # Windows
         - { os: windows-2019, ruby: '1.9' }
         - { os: windows-2019, ruby: '3.3' }

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.3.0-preview2, head, debug, mingw, mswin, ucrt |
-| `jruby` | 9.1.17.0 - 9.4.3.0, head |
-| `truffleruby` | 19.3.0 - 23.1.0, head |
-| `truffleruby+graalvm` | 21.2.0 - 23.1.0, head |
+| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.3.0, head, debug, mingw, mswin, ucrt |
+| `jruby` | 9.1.17.0 - 9.4.5.0, head |
+| `truffleruby` | 19.3.0 - 23.1.1, head |
+| `truffleruby+graalvm` | 21.2.0 - 23.1.1, head |
 
 `ruby-debug` is the same as `ruby-head` but with assertions enabled (`-DRUBY_DEBUG=1`).  
 
@@ -70,7 +70,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.2' # Not needed with a .ruby-version file
+        ruby-version: '3.3' # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - run: bundle exec rake
 ```
@@ -89,7 +89,7 @@ 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', head, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', head, jruby, jruby-head, truffleruby, truffleruby-head]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -118,7 +118,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: '3.3'
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - run: bundle exec rake
 ```
@@ -263,6 +263,9 @@ In other cases, you will need to install Ruby in the runner tool cache as shown
 (run it so it will show you where to install Ruby).
 You could of course also not use this action and e.g. use Ruby from a system package or use a Docker image instead.
 
+See also the [`self-hosted:` input](action.yml).
+You can set it to `true` if you want to use custom-built Rubies in your self-hosted toolcache instead of prebuild Rubies.
+
 ## History
 
 This action used to be at `eregon/use-ruby-action` and was moved to the `ruby` organization.

action.yml

@@ -34,10 +34,10 @@ inputs:
     description: |
       Consider the runner as a self-hosted runner, which means not using prebuilt Ruby binaries which only work
       on GitHub-hosted runners or self-hosted runners with a very similar image to the ones used by GitHub runners.
-      The default is to detect this automatically based on the OS, OS version and $RUNNER_TOOL_CACHE.
+      The default is to detect this automatically based on the OS, OS version and architecture.
 outputs:
   ruby-prefix:
     description: 'The prefix of the installed ruby'
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'dist/index.js'

common.js

@@ -173,7 +173,7 @@ const GitHubHostedPlatforms = [
   'windows-2022-x64',
 ]
 
-// Actually a self-hosted runner for which  the OS and OS version does not correspond to a GitHub-hosted runner image,
+// Actually a self-hosted runner for which the OS and OS version does not correspond to a GitHub-hosted runner image,
 export function isSelfHostedRunner() {
   if (inputs.selfHosted === undefined) {
     throw new Error('inputs.selfHosted should have been already set')

index.js

@@ -1,5 +1,3 @@
-import {getOSNameVersion} from "./common";
-
 const os = require('os')
 const fs = require('fs')
 const path = require('path')
@@ -32,6 +30,9 @@ export async function run() {
       core.setFailed(error.stack)
     }
   }
+  // Explicit process.exit() to not wait hanging promises,
+  // see https://github.com/ruby/setup-ruby/issues/543
+  process.exit()
 }
 
 // entry point when this action is run from other actions

ruby-builder-versions.json

@@ -12,14 +12,14 @@
     "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.1.0-preview1", "3.1.0", "3.1.1", "3.1.2", "3.1.3", "3.1.4",
     "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.3.0-preview1", "3.3.0-preview2",
+    "3.3.0-preview1", "3.3.0-preview2", "3.3.0-preview3", "3.3.0-rc1", "3.3.0",
     "head", "debug"
   ],
   "jruby": [
     "9.1.17.0",
     "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0", "9.2.20.0", "9.2.20.1", "9.2.21.0",
-    "9.3.0.0", "9.3.1.0", "9.3.2.0", "9.3.3.0", "9.3.4.0", "9.3.6.0", "9.3.7.0", "9.3.8.0", "9.3.9.0", "9.3.10.0", "9.3.11.0",
-    "9.4.0.0", "9.4.1.0", "9.4.2.0", "9.4.3.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.4.0.0", "9.4.1.0", "9.4.2.0", "9.4.3.0", "9.4.4.0", "9.4.5.0",
     "head"
   ],
   "truffleruby": [
@@ -27,13 +27,13 @@
     "20.0.0", "20.1.0", "20.2.0", "20.3.0",
     "21.0.0", "21.1.0", "21.2.0", "21.2.0.1", "21.3.0",
     "22.0.0.2", "22.1.0", "22.2.0", "22.3.0", "22.3.1",
-    "23.0.0-preview1", "23.0.0", "23.1.0",
+    "23.0.0-preview1", "23.0.0", "23.1.0", "23.1.1",
     "head"
   ],
   "truffleruby+graalvm": [
     "21.2.0", "21.3.0",
     "22.0.0.2", "22.1.0", "22.2.0", "22.3.0", "22.3.1",
-    "23.0.0-preview1", "23.0.0", "23.1.0",
+    "23.0.0-preview1", "23.0.0", "23.1.0", "23.1.1",
     "head"
   ]
 }

windows-versions.json

@@ -57,6 +57,7 @@
   "3.2.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.0-1/rubyinstaller-3.2.0-1-x64.7z",
   "3.2.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.1-1/rubyinstaller-3.2.1-1-x64.7z",
   "3.2.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.2-1/rubyinstaller-3.2.2-1-x64.7z",
+  "3.3.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.0-1/rubyinstaller-3.3.0-1-x64.7z",
   "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z",
   "mingw": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z",
   "mswin": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z",