From 4ada6e69af630ffce0cefd291affc62f965d12e7 Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 30 Oct 2024 08:26:36 -0700 Subject: [PATCH] feat: update supported Ruby versions --- .github/workflows/ci.yml | 16 ++++++++-------- README.md | 2 +- examples/gem/.ruby-version | 2 +- examples/jekyll/MODULE.bazel | 2 +- ruby/private/bundler_checksums.bzl | 16 ++++++++++++++++ ruby/private/download.bzl | 3 ++- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c91f07c..8e8cce82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,11 +35,11 @@ jobs: matrix: ruby: - 3.1.6 - - 3.2.4 - - 3.3.2 - - 3.4.0-preview1 - - jruby-9.4.7.0 - - truffleruby-24.0.1 + - 3.2.5 # 3.2.6 is not yet available on Windows. + - 3.3.5 + - 3.4.0-preview2 + - jruby-9.4.8.0 + - truffleruby-24.1.1 - system os: - ubuntu-latest @@ -52,15 +52,15 @@ jobs: exclude: # Previews are unavailable on Windows. - os: windows-latest - ruby: 3.4.0-preview1 + ruby: 3.4.0-preview2 # JRuby with bzlmod fails with long path issues on Windows. # See #64 - os: windows-latest - ruby: jruby-9.4.7.0 + ruby: jruby-9.4.8.0 mode: bzlmod # TruffleRuby doesn't work on Windows. - os: windows-latest - ruby: truffleruby-24.0.1 + ruby: truffleruby-24.1.1 defaults: run: working-directory: examples/gem diff --git a/README.md b/README.md index 045b0b1c..8668d539 100755 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The ruleset is known to work with: load("@rules_ruby//ruby:deps.bzl", "rb_register_toolchains") rb_register_toolchains( - version = "3.0.6", + version = "3.1.6", # alternatively, load version from .ruby-version file # version_file = "//:.ruby-version", ) diff --git a/examples/gem/.ruby-version b/examples/gem/.ruby-version index 0117b3e1..dac625a8 100644 --- a/examples/gem/.ruby-version +++ b/examples/gem/.ruby-version @@ -1 +1 @@ -jruby-9.4.7.0 +jruby-9.4.8.0 diff --git a/examples/jekyll/MODULE.bazel b/examples/jekyll/MODULE.bazel index 85242db9..85e4b56e 100644 --- a/examples/jekyll/MODULE.bazel +++ b/examples/jekyll/MODULE.bazel @@ -11,7 +11,7 @@ local_path_override( ruby = use_extension("@rules_ruby//ruby:extensions.bzl", "ruby") ruby.toolchain( name = "ruby", - version = "3.2.4", + version = "3.2.5", ) use_repo(ruby, "ruby") ruby.bundle_fetch( diff --git a/ruby/private/bundler_checksums.bzl b/ruby/private/bundler_checksums.bzl index d3a53466..27e8100c 100644 --- a/ruby/private/bundler_checksums.bzl +++ b/ruby/private/bundler_checksums.bzl @@ -4,6 +4,22 @@ # 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 = { + "2.5.22": "763f30d598ee58742eea29285875435ea722218d4df149de35bce37c02ce968e", + "2.5.21": "203d645e5f6daa60bbfb4cccb1a7d4aba8171674e00bc28724284740f8d9effb", + "2.5.20": "83bccb5ccc456e347089aa05318ecd27bb9840caa64ed16c1703b50d49b0ab94", + "2.5.19": "f856615c98070b70e58a69bc82882416498d19cb325fd18322da727385e0163f", + "2.5.18": "042439fa8a5a2a64c37df8e4f6be5cd98d3f8fd5bcf511a1858b4878ef408a31", + "2.5.17": "c4ef7050367e22f28e7928eb95ba055d111c2c4cd398de2ba8f6ab1532e46d3a", + "2.5.16": "87ba0338f40d5928a79b1ab067867a36cde58135d08b63267ef639795b95983a", + "2.5.15": "614280f031ff8d9adec0446b5cafda0103a2486520d556f9fc14d18762c48613", + "2.5.14": "4b4be1b062ec3c9fbf7fe36d669c72187aa6f0d310077bfdfe6f2c26696c5544", + "2.5.13": "e43d6dd6dfd707ea085ffcdef2255b94656c1e6d124ac867760eb3c44e2bd2bd", + "2.5.12": "57e55d69ce82eec540abf19b60f89db54e9c02e42e8483d2f843143b438907f2", + "2.5.11": "dd784bfe53834b39a56e642dbc6e1eca19a2e6454e4d53994cb7298005ac4c2e", + "2.5.10": "7ad6beed8fa49a79a592029f773f2492b9f4ef916d8a72cee4e2d104e5b6faad", + "2.5.9": "e2b61325be359bce54eb0fed88404efe67e5e1f8003d34a221841e3b765aec06", + "2.5.8": "18bbe29d0c26d6453197f94da75fafafd56a003337b6e2d2f6e443af609a20c2", + "2.5.7": "0dfe04a1f0ec13cdbc579f724cd0f7fa17437db07b89a41f5997e20bf4a8340e", "2.5.6": "1a1f21d1456e16dd2fee93461d9640348047aa2dcaf5d776874a60ddd4df5c64", "2.5.5": "13c7fe269030e2a6402a654c06deff01aef674ced649db3be98b5503a080a462", "2.5.4": "f7b9f08c47e8c665613a668aa1b633df63f818b99183cee4b797704a816edefe", diff --git a/ruby/private/download.bzl b/ruby/private/download.bzl index 9b340804..71740214 100644 --- a/ruby/private/download.bzl +++ b/ruby/private/download.bzl @@ -1,6 +1,6 @@ "Repository rule for fetching Ruby interpreters" -RUBY_BUILD_VERSION = "20240530.1" +RUBY_BUILD_VERSION = "20241030" _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" @@ -33,6 +33,7 @@ _JRUBY_VERSIONS = { "9.4.5.0": "a40f78c4641ccc86752e16b2da247fd6bc9fbcf9a4864cf1be36f7ff7b35684c", "9.4.6.0": "2da14de4152b71fdbfa35ba4687a46ef12cd465740337b549cc1fe6c7c139813", "9.4.7.0": "f1c39f8257505300a528ff83fe4721fbe61a855abb25e3d27d52d43ac97a4d80", + "9.4.8.0": "347b6692bd9c91c480a45af25ce88d77be8b6e4ac4a77bc94870f2c5b54bc929", } _JRUBY_INTEGRITY_MISSING = """