diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d014087e..0083aaad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,12 +36,12 @@ jobs: fail-fast: false matrix: ruby: - - 3.2.9 - - 3.3.9 - - 3.4.6 - - 4.0.1 - - jruby-10.0.2.0 - - truffleruby-33.0.0 + - 3.2.11 + - 3.3.11 + - 3.4.9 + - 4.0.3 + - jruby-10.1.0.0 + - truffleruby-34.0.1 - system os: - ubuntu-latest @@ -53,7 +53,7 @@ jobs: exclude: # TruffleRuby doesn't work on Windows. - os: windows-latest - ruby: truffleruby-33.0.0 + ruby: truffleruby-34.0.1 defaults: run: working-directory: examples/gem @@ -71,7 +71,7 @@ jobs: - if: matrix.ruby == 'system' uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.9 + ruby-version: 3.2.11 - run: bazel build ... - run: bazel run lib/gem:add-numbers 2 - run: bazel run lib/gem:print-version @@ -133,8 +133,8 @@ jobs: fail-fast: false matrix: ruby: - - 3.3.9 - - jruby-10.0.2.0 + - 3.3.11 + - jruby-10.1.0.0 use-system-ruby: - true - false @@ -165,7 +165,7 @@ jobs: fail-fast: false matrix: ruby: - - jruby-10.0.2.0 + - jruby-10.1.0.0 os: - ubuntu-latest - macos-latest @@ -187,7 +187,7 @@ jobs: - if: matrix.ruby == 'system' uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.9 + ruby-version: 3.2.11 - run: ./do_test examples-rails: @@ -198,7 +198,7 @@ jobs: fail-fast: false matrix: ruby: - - 3.4.8 + - 3.4.9 os: - ubuntu-latest - macos-latest @@ -224,7 +224,7 @@ jobs: fail-fast: false matrix: ruby: - - 3.4.5 + - 3.4.9 os: - ubuntu-latest - macos-latest diff --git a/README.md b/README.md index e1ad04e3..8d6fb851 100755 --- a/README.md +++ b/README.md @@ -104,8 +104,8 @@ The following toolchains are known to work and tested on CI. | MRI 3.4 | 🟩 | 🟩 | 🟩 | | MRI 3.3 | 🟩 | 🟩 | 🟩 | | MRI 3.2 | 🟩 | 🟩 | 🟩 | -| JRuby 10.0 | 🟩 | 🟩 | 🟩 | -| TruffleRuby 33.0 | 🟩 | 🟩 | 🟥 | +| JRuby 10.1 | 🟩 | 🟩 | 🟩 | +| TruffleRuby 34.0 | 🟩 | 🟩 | 🟥 | The following toolchains were previously known to work but _no longer tested on CI_. @@ -114,8 +114,10 @@ The following toolchains were previously known to work but _no longer tested on | MRI 3.1 | 🟩 | 🟩 | 🟩 | | MRI 3.0 | 🟩 | 🟩 | 🟩 | | MRI 2.7 | 🟩 | 🟩 | 🟩 | +| JRuby 10.0 | 🟩 | 🟩 | 🟩 | | JRuby 9.4 | 🟩 | 🟩 | 🟩 | | JRuby 9.3 | 🟩 | 🟩 | 🟩 | +| TruffleRuby 33.0 | 🟩 | 🟩 | 🟥 | | TruffleRuby 25.0 | 🟩 | 🟩 | 🟥 | | TruffleRuby 24.0 | 🟩 | 🟩 | 🟥 | | TruffleRuby 23.0 | 🟩 | 🟩 | 🟥 | diff --git a/examples/deep_gem/.ruby-version b/examples/deep_gem/.ruby-version index 7f84f9e1..a8ba5753 100644 --- a/examples/deep_gem/.ruby-version +++ b/examples/deep_gem/.ruby-version @@ -1 +1 @@ -jruby-10.0.2.0 +jruby-10.1.0.0 diff --git a/examples/gem/.ruby-version b/examples/gem/.ruby-version index 7f84f9e1..a8ba5753 100644 --- a/examples/gem/.ruby-version +++ b/examples/gem/.ruby-version @@ -1 +1 @@ -jruby-10.0.2.0 +jruby-10.1.0.0 diff --git a/examples/jekyll/MODULE.bazel b/examples/jekyll/MODULE.bazel index 1dd1e8b7..b76f3fad 100644 --- a/examples/jekyll/MODULE.bazel +++ b/examples/jekyll/MODULE.bazel @@ -14,7 +14,7 @@ ruby = use_extension("@rules_ruby//ruby:extensions.bzl", "ruby") ruby.toolchain( name = "ruby", portable_ruby = True, - version = "3.2.8", + version = "3.2.11", ) use_repo(ruby, "ruby") diff --git a/examples/native_ext/.ruby-version b/examples/native_ext/.ruby-version index 7f84f9e1..a8ba5753 100644 --- a/examples/native_ext/.ruby-version +++ b/examples/native_ext/.ruby-version @@ -1 +1 @@ -jruby-10.0.2.0 +jruby-10.1.0.0 diff --git a/examples/proto/.ruby-version b/examples/proto/.ruby-version index 47b322c9..0ce07b72 100644 --- a/examples/proto/.ruby-version +++ b/examples/proto/.ruby-version @@ -1 +1 @@ -3.4.1 +3.4.11 diff --git a/examples/rails/.ruby-version b/examples/rails/.ruby-version index 7921bd0c..0ce07b72 100644 --- a/examples/rails/.ruby-version +++ b/examples/rails/.ruby-version @@ -1 +1 @@ -3.4.8 +3.4.11 diff --git a/ruby/private/bundler_checksums.bzl b/ruby/private/bundler_checksums.bzl index 46598574..997aabf3 100644 --- a/ruby/private/bundler_checksums.bzl +++ b/ruby/private/bundler_checksums.bzl @@ -4,6 +4,11 @@ # curl -sSf https://rubygems.org/api/v1/versions/bundler.json | jq 'map({key: .number, value: .sha}) | from_entries' | grep -vE '\.pre|\.rc|\.beta' BUNDLER_CHECKSUMS = { + "4.0.11": "5bcec0fb78302e48d02ee46f10ee6e6942be647ba5b44a6d1ddfda9a240ce785", + "4.0.10": "ee73a75abe610f4f2bb4dece7459587eb19b30276fd0998257ec9bd6f64ce3e9", + "4.0.9": "1f76de64e7c5b5260d5e144f3f709a4369286f9154af08b3199702639860bb3b", + "4.0.8": "ad75e7903192d544bc62b377a35815d477459b7fbea6660991492e453e0be9b4", + "4.0.7": "f8d8ab45cfdb755983de2c867a29680196a5340f6979f8a354b9244a49c20b17", "4.0.6": "4e43c13acf18c417926053d00f964a45c54f71721b33066336a0d7db5de73f08", "4.0.5": "5d52254ae14057ad6b02b20615436bd585790a7ca5ee3ef7ac05799dc90723fd", "4.0.4": "d0f94b7ba176666896318e419f9a0cc55b698874bffec64cc33537611c61bd16", diff --git a/ruby/private/download.bzl b/ruby/private/download.bzl index 74037fe9..44fec788 100644 --- a/ruby/private/download.bzl +++ b/ruby/private/download.bzl @@ -2,7 +2,7 @@ load("//ruby/private:portable_ruby_checksums.bzl", "PORTABLE_RUBY_CHECKSUMS", "PORTABLE_RUBY_DEFAULT_SUFFIXES") -RUBY_BUILD_VERSION = "20260114" +RUBY_BUILD_VERSION = "20260512" _JRUBY_BINARY_URL = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/{version}/jruby-dist-{version}-bin.tar.gz" _RUBY_BUILD_URL = "https://github.com/rbenv/ruby-build/archive/refs/tags/v{version}.tar.gz" @@ -48,6 +48,10 @@ _JRUBY_VERSIONS = { "10.0.0.1": "0ba34ac5dfec7c22659b14db668a06284db7fc1c820c49c04b92271a6636bafb", "10.0.1.0": "22174ed408aa19340fc3c609b67f5a83374539ecc50053153d60f6e1f81faa9d", "10.0.2.0": "b8a026f38aa98461a04ed0aa0b20891ce257ecbe53e124719ce9ee5b804525f1", + "10.0.3.0": "0edb5b02c3f482205d1cf8358f38e31d9e4c6d93a210039224750c72501e4717", + "10.0.4.0": "d0260ebc753a5e9ae49be1eec0e4eec907aaf2b7184faaafc879b0ec3253ca24", + "10.0.5.0": "6b3aa0340bd60a2b131e12490bb498c45359d9c91e477f5760c3aa18e37d1988", + "10.1.0.0": "9c14a0ce81f3a312fd98c415986982132e91d36b12cb8d74a3dfdae93fe984ac", } _JRUBY_INTEGRITY_MISSING = """ diff --git a/ruby/private/portable_ruby_checksums.bzl b/ruby/private/portable_ruby_checksums.bzl index a25132e0..8eedbfca 100644 --- a/ruby/private/portable_ruby_checksums.bzl +++ b/ruby/private/portable_ruby_checksums.bzl @@ -6,6 +6,7 @@ # Maps each Ruby version to its current default release suffix. # Updated automatically when a new rebuild (-2, -3, etc.) is published. PORTABLE_RUBY_DEFAULT_SUFFIXES = { + "4.0.4": "1", "4.0.3": "1", "4.0.2": "1", "4.0.1": "1", @@ -211,5 +212,9 @@ PORTABLE_RUBY_CHECKSUMS = { "ruby-4.0.3.arm64_linux.tar.gz": "809787624ef02d09fa467dc1cc3b97f353134f4444523409194eb8b824d9f2c6", "ruby-4.0.3.x86_64_darwin.tar.gz": "fd67f963deed2768659b5e04e8571dd6d46c0f12731eef33a682c6c35c85d377", "ruby-4.0.3.x86_64_linux.tar.gz": "98ea581ad9b351496eb9360cfb3da2ad8cf1eeba44d8473420c00edf8e418a20", + "ruby-4.0.4.arm64_darwin.tar.gz": "ac99dc401aacf7c6d7f234cc4b7347d8d1faaa8e6f5a8d240c56b1a05ccddc2a", + "ruby-4.0.4.arm64_linux.tar.gz": "a00464b216e9de42203ca5bb66f881e35a57cea41335b0880a4fade9988977a4", + "ruby-4.0.4.x86_64_darwin.tar.gz": "df7ca6d15cfbf884f5a51b59439e23d1da9c88789992783e7e2f3c50d0995985", + "ruby-4.0.4.x86_64_linux.tar.gz": "2bf52d9d39e04afc0a06fa549dba4a13c75d30afb50f45a0ca9d7032f6d441ac", }, }