Skip to content

Commit c89efe1

Browse files
committed
CI: Add Ruby 4.0 and Rails 8.1 to CI Matrix
Fix a load error for the benchmark gem on Rails 6.1 with Ruby 4.0 Remove Ruby 3.2 from CI Matrix following rails-dev (Rails 8.2) support drop Bump actions/checkout from 4 to 6
1 parent 407602d commit c89efe1

File tree

8 files changed

+34
-14
lines changed

8 files changed

+34
-14
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
14-
gemfile: [rails_5.2.gemfile, rails_6.1.gemfile, rails_7.0.gemfile, rails_7.1.gemfile, rails_7.2.gemfile, rails_8.0.gemfile, rails_dev.gemfile]
13+
ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
14+
gemfile: [rails_5.2.gemfile, rails_6.1.gemfile, rails_7.0.gemfile, rails_7.1.gemfile, rails_7.2.gemfile, rails_8.0.gemfile, rails_8.1.gemfile, rails_dev.gemfile]
1515
exclude:
16-
# Ruby 3.2 is min version for Rails 8
16+
# Ruby 3.3 is min version for Rails 8.2
1717
- ruby: '2.5'
1818
gemfile: rails_dev.gemfile
1919
- ruby: '2.6'
@@ -24,6 +24,19 @@ jobs:
2424
gemfile: rails_dev.gemfile
2525
- ruby: '3.1'
2626
gemfile: rails_dev.gemfile
27+
- ruby: '3.2'
28+
gemfile: rails_dev.gemfile
29+
# Ruby 3.2 is min version for Rails 8.1
30+
- ruby: '2.5'
31+
gemfile: rails_8.1.gemfile
32+
- ruby: '2.6'
33+
gemfile: rails_8.1.gemfile
34+
- ruby: '2.7'
35+
gemfile: rails_8.1.gemfile
36+
- ruby: '3.0'
37+
gemfile: rails_8.1.gemfile
38+
- ruby: '3.1'
39+
gemfile: rails_8.1.gemfile
2740
# Ruby 3.2 is min version for Rails 8.0
2841
- ruby: '2.5'
2942
gemfile: rails_8.0.gemfile
@@ -65,11 +78,13 @@ jobs:
6578
gemfile: rails_5.2.gemfile
6679
- ruby: '3.4'
6780
gemfile: rails_5.2.gemfile
81+
- ruby: '4.0'
82+
gemfile: rails_5.2.gemfile
6883
runs-on: ubuntu-latest
6984
env:
7085
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
7186
steps:
72-
- uses: actions/checkout@v4
87+
- uses: actions/checkout@v6
7388
- uses: ruby/setup-ruby@v1
7489
with:
7590
ruby-version: ${{ matrix.ruby }}

Appraisals

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,34 @@ end
55

66
appraise 'rails-6.1' do
77
gem 'rails', '~> 6.1.0'
8-
gem 'activeresource', '~> 5.1.0'
8+
gem 'activeresource', '>= 5.1.0'
99
gem 'bigdecimal'
1010
gem 'mutex_m'
11+
gem 'benchmark'
1112
gem 'concurrent-ruby', '1.3.4'
1213
end
1314

1415
appraise 'rails-7.0' do
1516
gem 'rails', '~> 7.0.0'
16-
gem 'activeresource', '~> 6.0.0'
1717
gem 'bigdecimal'
1818
gem 'mutex_m'
1919
gem 'concurrent-ruby', '1.3.4'
2020
end
2121

2222
appraise 'rails-7.1' do
2323
gem 'rails', '~> 7.1.0'
24-
gem 'activeresource', '~> 6.0.0'
2524
end
2625

2726
appraise 'rails-7.2' do
2827
gem 'rails', '~> 7.2.0'
29-
gem 'activeresource', '~> 6.0.0'
3028
end
3129

3230
appraise 'rails-8.0' do
3331
gem 'rails', '~> 8.0.0'
34-
gem 'activeresource', '~> 6.0.0'
32+
end
33+
34+
appraise 'rails-8.1' do
35+
gem 'rails', '~> 8.1.0'
3536
end
3637

3738
appraise 'rails-dev' do

gemfiles/rails_6.1.gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 6.1.0"
6-
gem "activeresource", "~> 5.1.0"
6+
gem "activeresource", ">= 5.1.0"
77
gem "bigdecimal"
88
gem "mutex_m"
9+
gem "benchmark"
910
gem "concurrent-ruby", "1.3.4"
1011

1112
gemspec path: "../"

gemfiles/rails_7.0.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 7.0.0"
6-
gem "activeresource", "~> 6.0.0"
76
gem "bigdecimal"
87
gem "mutex_m"
98
gem "concurrent-ruby", "1.3.4"

gemfiles/rails_7.1.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 7.1.0"
6-
gem "activeresource", "~> 6.0.0"
76

87
gemspec path: "../"

gemfiles/rails_7.2.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 7.2.0"
6-
gem "activeresource", "~> 6.0.0"
76

87
gemspec path: "../"

gemfiles/rails_8.0.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 8.0.0"
6-
gem "activeresource", "~> 6.0.0"
76

87
gemspec path: "../"

gemfiles/rails_8.1.gemfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 8.1.0"
6+
7+
gemspec path: "../"

0 commit comments

Comments
 (0)