Skip to content

Commit

Permalink
Fix tests to support Rails 8 and Ruby 3.4
Browse files Browse the repository at this point in the history
- pin concurrent-ruby because logger is not explicitly requried < 7.1
  • Loading branch information
trevorrjohn committed Jan 29, 2025
1 parent 5fc0b10 commit 7d3f032
Show file tree
Hide file tree
Showing 17 changed files with 696 additions and 335 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,23 @@ jobs:
- "3.1"
- "3.2"
- "3.3"
- "3.4"
gemfile:
- gemfiles/rails_6_1.gemfile
- gemfiles/rails_7_0.gemfile
- gemfiles/rails_7_1.gemfile
- gemfiles/rails_7_2.gemfile
- gemfiles/rails_8_0.gemfile
- gemfiles/rails_main.gemfile
continue-on-error: [ false ]
exclude:
- ruby-version: "3.3"
gemfile: gemfiles/rails_6_1.gemfile
- ruby-version: "3.4"
gemfile: gemfiles/rails_6_1.gemfile
- ruby-version: "3.1"
gemfile: gemfiles/rails_8_0.gemfile
- ruby-version: "3.1"
gemfile: gemfiles/rails_main.gemfile

name: ${{ format('Tests (Ruby {0}, {1})', matrix.ruby-version, matrix.gemfile) }}
runs-on: ubuntu-latest
Expand Down
7 changes: 7 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
appraise "rails_6_1" do
gem "rails", "~> 6.1.0"
gem 'concurrent-ruby', '<= 1.3.4'
end

appraise "rails_7_0" do
gem "rails", "~> 7.0.0"
gem 'concurrent-ruby', '<= 1.3.4'
gem "propshaft"
end

Expand All @@ -17,6 +19,11 @@ appraise "rails_7_2" do
gem "propshaft"
end

appraise "rails_8_0" do
gem "rails", "~> 8.0.0"
gem "propshaft"
end

appraise "rails_main" do
gem "rails", github: "rails/rails", branch: "main"
gem "propshaft"
Expand Down
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

# Specify your gem's dependencies in importmap-rails.gemspec.
# Specify your gem's dependencies in jsbundling-rails.gemspec.
gemspec

gem "appraisal"
gem "rails", "~> 6.1.0"
gem "sprockets-rails"
gem "rails", "~> 8.0.0"
gem "sqlite3"

group :test do
Expand Down
Loading

0 comments on commit 7d3f032

Please sign in to comment.