From 16a2c1865a3ea4b733e7bcb8c341872a42524ef7 Mon Sep 17 00:00:00 2001 From: Chad Wilson <29788154+chadlwilson@users.noreply.github.com> Date: Wed, 2 Jul 2025 16:31:08 +1200 Subject: [PATCH 1/3] Run tests with JRuby 9.4.13.0 --- .github/workflows/maven.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 585b808b6..b6406b803 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,7 +9,7 @@ on: env: # Default versions for canonical release build DEFAULT_JAVA_VERSION: '8' - DEFAULT_JRUBY_VERSION: '9.4.12.1' # Should match pom.xml property (AND a version inside the test matrix) + DEFAULT_JRUBY_VERSION: '9.4.13.0' # Should match pom.xml property (AND a version inside the test matrix) jobs: build: @@ -18,7 +18,7 @@ jobs: strategy: matrix: - jruby_version: [ '9.3.15.0', '9.4.12.1', '10.0.0.1' ] + jruby_version: [ '9.3.15.0', '9.4.13.0', '10.0.0.1' ] java_version: [ '8', '11', '17', '21' ] exclude: - jruby_version: '10.0.0.1' @@ -54,7 +54,7 @@ jobs: strategy: matrix: - jruby_version: [ '9.3.15.0', '9.4.12.1', '10.0.0.1' ] + jruby_version: [ '9.3.15.0', '9.4.13.0', '10.0.0.1' ] java_version: [ '8', '11', '17', '21' ] appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72', 'rails80' ] exclude: @@ -66,7 +66,7 @@ jobs: appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support - jruby_version: '9.3.15.0' appraisal: 'rails80' # Requires Ruby 3.4 compatibility, which JRuby 9.3 does not support - - jruby_version: '9.4.12.1' + - jruby_version: '9.4.13.0' appraisal: 'rails80' # Requires Ruby 3.4 compatibility, which JRuby 9.4 does not support - jruby_version: '10.0.0.1' java_version: '8' # JRuby 10 requires Java 21 From c260d5ce0adf5b0f02196eb1cba0b544f1c7f8a7 Mon Sep 17 00:00:00 2001 From: Chad Wilson <29788154+chadlwilson@users.noreply.github.com> Date: Wed, 2 Jul 2025 16:31:49 +1200 Subject: [PATCH 2/3] Update changelog --- History.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.md b/History.md index 2bd3d9a78..218da2ea7 100644 --- a/History.md +++ b/History.md @@ -3,7 +3,7 @@ - Adds basic compatibility with JRuby 10.0 - Drop unnecessary jruby.compat.version and RackConfig.getCompatVersion() API - Drop JMS support -- update (bundled) rack to 2.2.16 +- update (bundled) rack to 2.2.17 ## 1.2.4 (UNRELEASED) From d96b64fc196e5726761db359278c81ae4e689b14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 12:14:59 +0000 Subject: [PATCH 3/3] Bump ruby/setup-ruby from 1.244.0 to 1.245.0 in the actions-deps group Bumps the actions-deps group with 1 update: [ruby/setup-ruby](https://github.com/ruby/setup-ruby). Updates `ruby/setup-ruby` from 1.244.0 to 1.245.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](https://github.com/ruby/setup-ruby/compare/13e7a03dc3ac6c3798f4570bfead2aed4d96abfb...a4effe49ee8ee5b8b5091268c473a4628afb5651) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.245.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-deps ... Signed-off-by: dependabot[bot] --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b6406b803..cd1acd8d3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -91,7 +91,7 @@ jobs: cache: maven - name: Setup JRuby - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0 + uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0 with: ruby-version: jruby-${{ matrix.jruby_version }} bundler-cache: 'false' # Need to install later so we can vary from Gemfile.lock as required for JRuby version compatibility