Skip to content

Commit 559ed82

Browse files
committed
Fix tests to support Rails 8 and Ruby 3.4
- pin concurrent-ruby because logger is not explicitly requried < 7.1
1 parent 5fc0b10 commit 559ed82

17 files changed

+698
-334
lines changed

.github/workflows/ci.yml

+13
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,26 @@ jobs:
99
- "3.1"
1010
- "3.2"
1111
- "3.3"
12+
- "3.4"
1213
gemfile:
1314
- gemfiles/rails_6_1.gemfile
1415
- gemfiles/rails_7_0.gemfile
1516
- gemfiles/rails_7_1.gemfile
1617
- gemfiles/rails_7_2.gemfile
18+
- gemfiles/rails_8_0.gemfile
1719
- gemfiles/rails_main.gemfile
1820
continue-on-error: [ false ]
21+
exclude:
22+
- ruby-version: "3.3"
23+
gemfile: gemfiles/rails_6_1.gemfile
24+
- ruby-version: "3.4"
25+
gemfile: gemfiles/rails_6_1.gemfile
26+
- ruby-version: "3.4"
27+
gemfile: gemfiles/rails_7_0.gemfile
28+
- ruby-version: "3.1"
29+
gemfile: gemfiles/rails_8_0.gemfile
30+
- ruby-version: "3.1"
31+
gemfile: gemfiles/rails_main.gemfile
1932

2033
name: ${{ format('Tests (Ruby {0}, {1})', matrix.ruby-version, matrix.gemfile) }}
2134
runs-on: ubuntu-latest

Appraisals

+7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
appraise "rails_6_1" do
22
gem "rails", "~> 6.1.0"
3+
gem 'concurrent-ruby', '<= 1.3.4'
34
end
45

56
appraise "rails_7_0" do
67
gem "rails", "~> 7.0.0"
8+
gem 'concurrent-ruby', '<= 1.3.4'
79
gem "propshaft"
810
end
911

@@ -17,6 +19,11 @@ appraise "rails_7_2" do
1719
gem "propshaft"
1820
end
1921

22+
appraise "rails_8_0" do
23+
gem "rails", "~> 8.0.0"
24+
gem "propshaft"
25+
end
26+
2027
appraise "rails_main" do
2128
gem "rails", github: "rails/rails", branch: "main"
2229
gem "propshaft"

Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
# Specify your gem's dependencies in importmap-rails.gemspec.
4+
# Specify your gem's dependencies in jsbundling-rails.gemspec.
55
gemspec
66

77
gem "appraisal"
8-
gem "rails", "~> 6.1.0"
9-
gem "sprockets-rails"
8+
gem "rails", "~> 8.0.0"
109
gem "sqlite3"
1110

1211
group :test do

0 commit comments

Comments
 (0)