Skip to content

Commit 22cca8f

Browse files
authored
Merge pull request #241 from rails/rmf-ci
Improve CI coverage
2 parents 6139ad1 + fde13ba commit 22cca8f

File tree

7 files changed

+153
-100
lines changed

7 files changed

+153
-100
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,21 @@ jobs:
88
- "3.1"
99
- "3.2"
1010
- "3.3"
11-
continue-on-error: [false]
11+
- "3.4"
12+
rails-version:
13+
- "7.0"
14+
- "7.1"
15+
- "7.2"
16+
- "8.0"
17+
exclude:
18+
- ruby-version: "3.1"
19+
rails-version: "8.0"
20+
fail-fast: false
21+
env:
22+
BUNDLE_GEMFILE: gemfiles/Gemfile.rails-${{ matrix.rails-version }}
1223

13-
name: ${{ format('Tests (Ruby {0})', matrix.ruby-version) }}
24+
name: ${{ format('Tests (Ruby {0}) (Rails {1})', matrix.ruby-version, matrix.rails-version) }}
1425
runs-on: ubuntu-latest
15-
continue-on-error: ${{ matrix.continue-on-error }}
1626

1727
steps:
1828
- uses: actions/checkout@v4

Gemfile.lock

Lines changed: 106 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -9,67 +9,67 @@ PATH
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
actioncable (7.2.1)
13-
actionpack (= 7.2.1)
14-
activesupport (= 7.2.1)
12+
actioncable (8.0.2)
13+
actionpack (= 8.0.2)
14+
activesupport (= 8.0.2)
1515
nio4r (~> 2.0)
1616
websocket-driver (>= 0.6.1)
1717
zeitwerk (~> 2.6)
18-
actionmailbox (7.2.1)
19-
actionpack (= 7.2.1)
20-
activejob (= 7.2.1)
21-
activerecord (= 7.2.1)
22-
activestorage (= 7.2.1)
23-
activesupport (= 7.2.1)
18+
actionmailbox (8.0.2)
19+
actionpack (= 8.0.2)
20+
activejob (= 8.0.2)
21+
activerecord (= 8.0.2)
22+
activestorage (= 8.0.2)
23+
activesupport (= 8.0.2)
2424
mail (>= 2.8.0)
25-
actionmailer (7.2.1)
26-
actionpack (= 7.2.1)
27-
actionview (= 7.2.1)
28-
activejob (= 7.2.1)
29-
activesupport (= 7.2.1)
25+
actionmailer (8.0.2)
26+
actionpack (= 8.0.2)
27+
actionview (= 8.0.2)
28+
activejob (= 8.0.2)
29+
activesupport (= 8.0.2)
3030
mail (>= 2.8.0)
3131
rails-dom-testing (~> 2.2)
32-
actionpack (7.2.1)
33-
actionview (= 7.2.1)
34-
activesupport (= 7.2.1)
32+
actionpack (8.0.2)
33+
actionview (= 8.0.2)
34+
activesupport (= 8.0.2)
3535
nokogiri (>= 1.8.5)
36-
racc
37-
rack (>= 2.2.4, < 3.2)
36+
rack (>= 2.2.4)
3837
rack-session (>= 1.0.1)
3938
rack-test (>= 0.6.3)
4039
rails-dom-testing (~> 2.2)
4140
rails-html-sanitizer (~> 1.6)
4241
useragent (~> 0.16)
43-
actiontext (7.2.1)
44-
actionpack (= 7.2.1)
45-
activerecord (= 7.2.1)
46-
activestorage (= 7.2.1)
47-
activesupport (= 7.2.1)
42+
actiontext (8.0.2)
43+
actionpack (= 8.0.2)
44+
activerecord (= 8.0.2)
45+
activestorage (= 8.0.2)
46+
activesupport (= 8.0.2)
4847
globalid (>= 0.6.0)
4948
nokogiri (>= 1.8.5)
50-
actionview (7.2.1)
51-
activesupport (= 7.2.1)
49+
actionview (8.0.2)
50+
activesupport (= 8.0.2)
5251
builder (~> 3.1)
5352
erubi (~> 1.11)
5453
rails-dom-testing (~> 2.2)
5554
rails-html-sanitizer (~> 1.6)
56-
activejob (7.2.1)
57-
activesupport (= 7.2.1)
55+
activejob (8.0.2)
56+
activesupport (= 8.0.2)
5857
globalid (>= 0.3.6)
59-
activemodel (7.2.1)
60-
activesupport (= 7.2.1)
61-
activerecord (7.2.1)
62-
activemodel (= 7.2.1)
63-
activesupport (= 7.2.1)
58+
activemodel (8.0.2)
59+
activesupport (= 8.0.2)
60+
activerecord (8.0.2)
61+
activemodel (= 8.0.2)
62+
activesupport (= 8.0.2)
6463
timeout (>= 0.4.0)
65-
activestorage (7.2.1)
66-
actionpack (= 7.2.1)
67-
activejob (= 7.2.1)
68-
activerecord (= 7.2.1)
69-
activesupport (= 7.2.1)
64+
activestorage (8.0.2)
65+
actionpack (= 8.0.2)
66+
activejob (= 8.0.2)
67+
activerecord (= 8.0.2)
68+
activesupport (= 8.0.2)
7069
marcel (~> 1.0)
71-
activesupport (7.2.1)
70+
activesupport (8.0.2)
7271
base64
72+
benchmark (>= 0.3)
7373
bigdecimal
7474
concurrent-ruby (~> 1.0, >= 1.3.1)
7575
connection_pool (>= 2.2.5)
@@ -79,28 +79,32 @@ GEM
7979
minitest (>= 5.1)
8080
securerandom (>= 0.3)
8181
tzinfo (~> 2.0, >= 2.0.5)
82-
base64 (0.2.0)
83-
bigdecimal (3.1.8)
82+
uri (>= 0.13.1)
83+
base64 (0.3.0)
84+
benchmark (0.4.1)
85+
bigdecimal (3.2.2)
8486
builder (3.3.0)
85-
concurrent-ruby (1.3.4)
86-
connection_pool (2.4.1)
87+
concurrent-ruby (1.3.5)
88+
connection_pool (2.5.3)
8789
crass (1.0.6)
88-
date (3.3.4)
89-
debug (1.9.2)
90+
date (3.4.1)
91+
debug (1.11.0)
9092
irb (~> 1.10)
9193
reline (>= 0.3.8)
92-
drb (2.2.1)
93-
erubi (1.13.0)
94+
drb (2.2.3)
95+
erb (5.0.1)
96+
erubi (1.13.1)
9497
globalid (1.2.1)
9598
activesupport (>= 6.1)
96-
i18n (1.14.5)
99+
i18n (1.14.7)
97100
concurrent-ruby (~> 1.0)
98-
io-console (0.7.2)
99-
irb (1.14.0)
101+
io-console (0.8.0)
102+
irb (1.15.2)
103+
pp (>= 0.6.0)
100104
rdoc (>= 4.0.0)
101105
reline (>= 0.4.2)
102-
logger (1.6.1)
103-
loofah (2.22.0)
106+
logger (1.7.0)
107+
loofah (2.24.1)
104108
crass (~> 1.0.2)
105109
nokogiri (>= 1.12.0)
106110
mail (2.8.1)
@@ -110,84 +114,90 @@ GEM
110114
net-smtp
111115
marcel (1.0.4)
112116
mini_mime (1.1.5)
113-
mini_portile2 (2.8.7)
114-
minitest (5.25.1)
115-
net-imap (0.4.16)
117+
mini_portile2 (2.8.9)
118+
minitest (5.25.5)
119+
net-imap (0.5.9)
116120
date
117121
net-protocol
118122
net-pop (0.1.2)
119123
net-protocol
120124
net-protocol (0.2.2)
121125
timeout
122-
net-smtp (0.5.0)
126+
net-smtp (0.5.1)
123127
net-protocol
124-
nio4r (2.7.3)
125-
nokogiri (1.16.7)
128+
nio4r (2.7.4)
129+
nokogiri (1.18.8)
126130
mini_portile2 (~> 2.8.2)
127131
racc (~> 1.4)
128-
nokogiri (1.16.7-arm64-darwin)
132+
nokogiri (1.18.8-arm64-darwin)
129133
racc (~> 1.4)
130-
nokogiri (1.16.7-x86_64-darwin)
134+
nokogiri (1.18.8-x86_64-darwin)
131135
racc (~> 1.4)
132-
nokogiri (1.16.7-x86_64-linux)
136+
nokogiri (1.18.8-x86_64-linux-gnu)
133137
racc (~> 1.4)
134-
psych (5.1.2)
138+
pp (0.6.2)
139+
prettyprint
140+
prettyprint (0.2.0)
141+
psych (5.2.6)
142+
date
135143
stringio
136144
racc (1.8.1)
137-
rack (3.1.7)
138-
rack-session (2.0.0)
145+
rack (3.1.16)
146+
rack-session (2.1.1)
147+
base64 (>= 0.1.0)
139148
rack (>= 3.0.0)
140-
rack-test (2.1.0)
149+
rack-test (2.2.0)
141150
rack (>= 1.3)
142-
rackup (2.1.0)
151+
rackup (2.2.1)
143152
rack (>= 3)
144-
webrick (~> 1.8)
145-
rails (7.2.1)
146-
actioncable (= 7.2.1)
147-
actionmailbox (= 7.2.1)
148-
actionmailer (= 7.2.1)
149-
actionpack (= 7.2.1)
150-
actiontext (= 7.2.1)
151-
actionview (= 7.2.1)
152-
activejob (= 7.2.1)
153-
activemodel (= 7.2.1)
154-
activerecord (= 7.2.1)
155-
activestorage (= 7.2.1)
156-
activesupport (= 7.2.1)
153+
rails (8.0.2)
154+
actioncable (= 8.0.2)
155+
actionmailbox (= 8.0.2)
156+
actionmailer (= 8.0.2)
157+
actionpack (= 8.0.2)
158+
actiontext (= 8.0.2)
159+
actionview (= 8.0.2)
160+
activejob (= 8.0.2)
161+
activemodel (= 8.0.2)
162+
activerecord (= 8.0.2)
163+
activestorage (= 8.0.2)
164+
activesupport (= 8.0.2)
157165
bundler (>= 1.15.0)
158-
railties (= 7.2.1)
159-
rails-dom-testing (2.2.0)
166+
railties (= 8.0.2)
167+
rails-dom-testing (2.3.0)
160168
activesupport (>= 5.0.0)
161169
minitest
162170
nokogiri (>= 1.6)
163-
rails-html-sanitizer (1.6.0)
171+
rails-html-sanitizer (1.6.2)
164172
loofah (~> 2.21)
165-
nokogiri (~> 1.14)
166-
railties (7.2.1)
167-
actionpack (= 7.2.1)
168-
activesupport (= 7.2.1)
173+
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
174+
railties (8.0.2)
175+
actionpack (= 8.0.2)
176+
activesupport (= 8.0.2)
169177
irb (~> 1.13)
170178
rackup (>= 1.0.0)
171179
rake (>= 12.2)
172180
thor (~> 1.0, >= 1.2.2)
173181
zeitwerk (~> 2.6)
174-
rake (13.2.1)
175-
rdoc (6.7.0)
182+
rake (13.3.0)
183+
rdoc (6.14.2)
184+
erb
176185
psych (>= 4.0.0)
177-
reline (0.5.10)
186+
reline (0.6.1)
178187
io-console (~> 0.5)
179-
securerandom (0.3.1)
180-
stringio (3.1.1)
188+
securerandom (0.4.1)
189+
stringio (3.1.7)
181190
thor (1.3.2)
182-
timeout (0.4.1)
191+
timeout (0.4.3)
183192
tzinfo (2.0.6)
184193
concurrent-ruby (~> 1.0)
185-
useragent (0.16.10)
186-
webrick (1.8.1)
187-
websocket-driver (0.7.6)
194+
uri (1.0.3)
195+
useragent (0.16.11)
196+
websocket-driver (0.8.0)
197+
base64
188198
websocket-extensions (>= 0.1.0)
189199
websocket-extensions (0.1.5)
190-
zeitwerk (2.6.18)
200+
zeitwerk (2.7.3)
191201

192202
PLATFORMS
193203
arm64-darwin-20

gemfiles/Gemfile.rails-7.0

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
3+
gemspec path: ".."
4+
5+
gem "rails", github: "rails/rails", branch: "7-0-stable"
6+
gem "rake"
7+
gem "debug"

gemfiles/Gemfile.rails-7.1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
3+
gemspec path: ".."
4+
5+
gem "rails", "~> 7.1.0"
6+
gem "rake"
7+
gem "debug"

gemfiles/Gemfile.rails-7.2

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
3+
gemspec path: ".."
4+
5+
gem "rails", "~> 7.2.0"
6+
gem "rake"
7+
gem "debug"

gemfiles/Gemfile.rails-8.0

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
3+
gemspec path: ".."
4+
5+
gem "rails", "~> 8.0"
6+
gem "rake"
7+
gem "debug"

test/dummy/config/environments/test.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@
2828
config.cache_store = :null_store
2929

3030
# Raise exceptions instead of rendering exception templates.
31-
config.action_dispatch.show_exceptions = :none
31+
if Rails.version < "7.1"
32+
config.action_dispatch.show_exceptions = false
33+
else
34+
# For Rails 7.0 and earlier, we set this to :none to avoid
35+
config.action_dispatch.show_exceptions = :none
36+
end
3237

3338
# Disable request forgery protection in test environment.
3439
config.action_controller.allow_forgery_protection = false

0 commit comments

Comments
 (0)