Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compatibility with Rack 2.x on Rails 7.0+, reinstating Rails appraisal tests #271

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
48624ff
Support only Rack 2.x with Rails, removing old 1.x rack/rails compat
chadlwilson Jan 21, 2025
d35b122
Workaround NameError frozen string literal issues with JRuby 9.3 and …
chadlwilson Jan 22, 2025
be1f629
Correct mock method visibility for newer JRuby tests
chadlwilson Jan 21, 2025
78bc656
Workaround logger require issues with concurrent-ruby 1.3.5 and older…
chadlwilson Jan 21, 2025
e34b0f6
Remove some deprecated rspec usage
chadlwilson Jan 22, 2025
c27409f
Re-enable Rails appraisals to run on modern Rails versions
chadlwilson Nov 26, 2024
6bab581
Remove old Rack 1.x / Rails < 3 compatibility code
chadlwilson Jan 22, 2025
f52da2e
Update README / history to reflect 1.2.x releases.
chadlwilson Jan 22, 2025
4dcb31c
Fix Rails 7.1 compatibility by ensuring active_support is required be…
chadlwilson Jan 23, 2025
28727fd
Bump jruby version to 9.4.12.0
chadlwilson Feb 19, 2025
61aef5b
Bump commons-logging from 1.3.4 to 1.3.5
chadlwilson Feb 19, 2025
96073cf
Update maven plugins to latest version
chadlwilson Feb 19, 2025
d392f94
Bump minor dependency versions
chadlwilson Feb 19, 2025
ab807be
Bump minor dependency versions for appraisals
chadlwilson Feb 19, 2025
4fed7a4
Bump bundled rack from 2.2.10 to 2.2.11
chadlwilson Feb 19, 2025
bbc9c0b
Remove old TODO
chadlwilson Feb 19, 2025
efd05d3
Bump rack in the ruby-deps group across 1 directory
dependabot[bot] Mar 5, 2025
8c2f334
Bump the maven-deps group across 1 directory with 4 updates
dependabot[bot] Mar 5, 2025
a31a9e1
Remove copy+pasted Spring test code, preferring upstream
chadlwilson Mar 5, 2025
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
87 changes: 76 additions & 11 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven
name: Java CI

on:
push:
Expand All @@ -21,22 +13,95 @@ jobs:

strategy:
matrix:
jruby_version: [ '9.3.15.0', '9.4.12.0' ]
java_version: [ '8', '11', '17', '21' ]
jruby_version: [ '9.3.15.0', '9.4.9.0' ]
fail-fast: false

steps:
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java_version }}
distribution: 'temurin'
cache: maven

- name: Build with Maven
run: mvn -B install --file pom.xml -Djruby.version=${{ matrix.jruby_version }}
run: mvn -B install -Djruby.version=${{ matrix.jruby_version }}

# Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
if: github.head_ref == 'refs/heads/master' && matrix.java_version == '8' && startsWith(matrix.jruby_version, '9.4')

appraisals:
needs: build
name: ${{ matrix.appraisal }} appraisal on ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
runs-on: ubuntu-latest

strategy:
matrix:
jruby_version: [ '9.3.15.0', '9.4.12.0' ]
java_version: [ '8', '11', '17', '21' ]
appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72' ]
exclude:
- jruby_version: '9.3.15.0'
java_version: '8'
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '8'
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '8'
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '11'
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '11'
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '11'
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '17'
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '17'
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '17'
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '21'
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '21'
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
- jruby_version: '9.3.15.0'
java_version: '21'
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
fail-fast: false

steps:
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java_version }}
distribution: 'temurin'
cache: maven

- name: Setup JRuby
uses: ruby/setup-ruby@v1
with:
ruby-version: jruby-${{ matrix.jruby_version }}
bundler: 2.3.27 # use version that is OK for JRuby 9.3

- name: Run appraisal for ${{ matrix.appraisal }}
env:
BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile
run: bundle install && bundle exec rake spec

Loading