Skip to content

Commit f0b4fd0

Browse files
Merge pull request #6 from ruby/master
upstream sync
2 parents 867e2d6 + bcde69c commit f0b4fd0

File tree

5 files changed

+22
-14
lines changed

5 files changed

+22
-14
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ ubuntu-20.04, 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 ]
20+
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 ]
2121
ruby: [
2222
'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,
2323
jruby, jruby-head,
@@ -286,7 +286,7 @@ jobs:
286286

287287
testFixedBundlerVersionForOldRuby:
288288
name: "Test bundler: 1.x for old Ruby"
289-
runs-on: ubuntu-20.04
289+
runs-on: ubuntu-22.04
290290
steps:
291291
- uses: actions/checkout@v4
292292
- uses: ./
@@ -411,7 +411,7 @@ jobs:
411411
run: ruby -e "abort if File.exist?('C:/msys64/mingw64/bin/gcc.exe')"
412412

413413
lint:
414-
runs-on: ubuntu-20.04
414+
runs-on: ubuntu-22.04
415415
steps:
416416
- uses: actions/checkout@v4
417417
- run: yarn install

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
1515

1616
| Interpreter | Versions |
1717
| ----------- | -------- |
18-
| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.4.2, head, debug, mingw, mswin, ucrt |
19-
| `jruby` | 9.1.17.0 - 9.4.12.0, head |
18+
| `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 |
19+
| `jruby` | 9.1.17.0 - 10.0.0.0, head |
2020
| `truffleruby` | 19.3.0 - 24.2.0, head |
2121
| `truffleruby+graalvm` | 21.2.0 - 24.2.0, head |
2222

@@ -53,15 +53,17 @@ The action works on these [GitHub-hosted runners](https://docs.github.com/en/act
5353
| macOS | `macos-13` and newer versions |
5454
| Windows | `windows-2019`, `windows-2022` |
5555

56+
Not all combinations of runner images and versions are supported.
57+
The list of available Ruby versions can be seen in [ruby-builder-versions.json](ruby-builder-versions.json) for Ubuntu and macOS
58+
(although some combinations are not available, see [the full list](https://github.com/ruby/ruby-builder/releases/tag/toolcache))
59+
and in [windows-versions.json](windows-versions.json) for Windows.
60+
5661
The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder)
5762
and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).
5863
The `mingw`, `ucrt` and `mswin` builds are generated by [ruby-loco](https://github.com/MSP-Greg/ruby-loco).
5964
`ruby-head` is generated by [ruby-dev-builder](https://github.com/ruby/ruby-dev-builder),
6065
`jruby-head` is generated by [jruby-dev-builder](https://github.com/ruby/jruby-dev-builder),
6166
`truffleruby-head` and `truffleruby+graalvm-head` are generated by [truffleruby-dev-builder](https://github.com/ruby/truffleruby-dev-builder).
62-
The full list of available Ruby versions can be seen in [ruby-builder-versions.json](ruby-builder-versions.json) for Ubuntu and macOS
63-
(although some combinations are not available, see [the full list](https://github.com/ruby/ruby-builder/releases/tag/toolcache))
64-
and in [windows-versions.json](windows-versions.json) for Windows.
6567

6668
## Usage
6769

0 commit comments

Comments
 (0)