Skip to content

Commit 027692f

Browse files
committed
Test against Rails 8 and fix Rails 7 logger dependency
1 parent 9aa3dd9 commit 027692f

File tree

4 files changed

+33
-17
lines changed

4 files changed

+33
-17
lines changed

.github/workflows/ruby.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push, pull_request]
55
jobs:
66
test:
77
name: Ruby ${{ matrix.ruby }} (${{ matrix.gemfile }})
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99
continue-on-error: ${{ matrix.gemfile == 'rails_head' }}
1010
env:
1111
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
@@ -19,23 +19,25 @@ jobs:
1919
- "3.1"
2020
- "3.2"
2121
- "3.3"
22+
- "3.4"
2223

2324
gemfile:
2425
- "rails_7_0"
2526
- "rails_7_1"
27+
- "rails_8_0"
2628
- "rails_head"
2729

2830
exclude:
31+
- ruby: '3.0'
32+
gemfile: rails_8_0
2933
- ruby: '3.0'
3034
gemfile: rails_head
31-
32-
include:
35+
- ruby: '3.1'
36+
gemfile: rails_8_0
3337
- ruby: '3.1'
3438
gemfile: rails_head
35-
- ruby: '3.2'
36-
gemfile: rails_head
37-
- ruby: head
38-
gemfile: rails_head
39+
- ruby: '3.4'
40+
gemfile: rails_7_0
3941

4042
steps:
4143
- uses: actions/checkout@v4

Appraisals

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
if RUBY_VERSION >= "2.7.0"
2-
appraise "rails-7-0" do
3-
gem "rails", "~> 7.0.0"
4-
end
1+
appraise "rails-7-0" do
2+
gem "rails", "~> 7.0.0"
3+
gem "concurrent-ruby", "< 1.3.5" # to avoid problem described in https://github.com/rails/rails/pull/54264
4+
end
5+
6+
appraise "rails-7-1" do
7+
gem "rails", "~> 7.1.0"
8+
end
59

6-
appraise "rails-7-1" do
7-
gem "rails", "~> 7.1.0"
8-
end
10+
appraise "rails-8-0" do
11+
gem "rails", "~> 8.0.0"
12+
end
913

10-
appraise "rails-head" do
11-
gem "rails", github: "rails/rails", branch: "main"
12-
end
14+
appraise "rails-head" do
15+
gem "rails", github: "rails/rails", branch: "main"
1316
end

gemfiles/rails_7_0.gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ gem "rake"
66
gem "mocha", require: false
77
gem "appraisal"
88
gem "rails", "~> 7.0.0"
9+
gem "concurrent-ruby", "< 1.3.5"
910

1011
gemspec path: "../"

gemfiles/rails_8_0.gemfile

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rake"
6+
gem "mocha", require: false
7+
gem "appraisal"
8+
gem "rails", "~> 8.0.0"
9+
10+
gemspec path: "../"

0 commit comments

Comments
 (0)