Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <jruby.version> property (AND a version inside the test matrix)
DEFAULT_JRUBY_VERSION: '9.4.13.0' # Should match pom.xml <jruby.version> property (AND a version inside the test matrix)

jobs:
build:
Expand All @@ -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'
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion History.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down