Skip to content

Commit 6bf1025

Browse files
authored
Improve CI (shakacode#512)
* Test against Rails 7.2 * Update default gemfile * Fix dummy app workflow * Remove references to arel There should be no reason to get arel from `github` and the commit history is not clear.
1 parent 6e769d2 commit 6bf1025

File tree

9 files changed

+104
-92
lines changed

9 files changed

+104
-92
lines changed

.github/workflows/generator.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,15 @@ jobs:
2424
- gemfiles/Gemfile-rails.6.1.x
2525
- gemfiles/Gemfile-rails.7.0.x
2626
- gemfiles/Gemfile-rails.7.1.x
27+
- gemfiles/Gemfile-rails.7.2.x
2728
# Uncomment the following line only to ensure compatibility with the
2829
# upcomming Rails versions, maybe before a release.
2930
#- gemfiles/Gemfile-rails-edge
3031
exclude:
32+
- ruby: '2.7'
33+
gemfile: gemfiles/Gemfile-rails.7.2.x
34+
- ruby: '3.0'
35+
gemfile: gemfiles/Gemfile-rails.7.2.x
3136
- ruby: '3.1'
3237
gemfile: gemfiles/Gemfile-rails.6.0.x
3338
- ruby: '3.2'

.github/workflows/ruby.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,15 @@ jobs:
4141
- gemfiles/Gemfile-rails.6.1.x
4242
- gemfiles/Gemfile-rails.7.0.x
4343
- gemfiles/Gemfile-rails.7.1.x
44+
- gemfiles/Gemfile-rails.7.2.x
4445
# Uncomment the following line only to ensure compatibility with the
4546
# upcomming Rails versions, maybe before a release.
4647
#- gemfiles/Gemfile-rails-edge
4748
exclude:
49+
- ruby: '2.7'
50+
gemfile: gemfiles/Gemfile-rails.7.2.x
51+
- ruby: '3.0'
52+
gemfile: gemfiles/Gemfile-rails.7.2.x
4853
- ruby: '3.1'
4954
gemfile: gemfiles/Gemfile-rails.6.0.x
5055
- ruby: '3.2'

Gemfile.lock

Lines changed: 81 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -11,86 +11,82 @@ PATH
1111
GEM
1212
remote: https://rubygems.org/
1313
specs:
14-
actioncable (7.1.3.4)
15-
actionpack (= 7.1.3.4)
16-
activesupport (= 7.1.3.4)
14+
actioncable (7.2.1)
15+
actionpack (= 7.2.1)
16+
activesupport (= 7.2.1)
1717
nio4r (~> 2.0)
1818
websocket-driver (>= 0.6.1)
1919
zeitwerk (~> 2.6)
20-
actionmailbox (7.1.3.4)
21-
actionpack (= 7.1.3.4)
22-
activejob (= 7.1.3.4)
23-
activerecord (= 7.1.3.4)
24-
activestorage (= 7.1.3.4)
25-
activesupport (= 7.1.3.4)
26-
mail (>= 2.7.1)
27-
net-imap
28-
net-pop
29-
net-smtp
30-
actionmailer (7.1.3.4)
31-
actionpack (= 7.1.3.4)
32-
actionview (= 7.1.3.4)
33-
activejob (= 7.1.3.4)
34-
activesupport (= 7.1.3.4)
35-
mail (~> 2.5, >= 2.5.4)
36-
net-imap
37-
net-pop
38-
net-smtp
20+
actionmailbox (7.2.1)
21+
actionpack (= 7.2.1)
22+
activejob (= 7.2.1)
23+
activerecord (= 7.2.1)
24+
activestorage (= 7.2.1)
25+
activesupport (= 7.2.1)
26+
mail (>= 2.8.0)
27+
actionmailer (7.2.1)
28+
actionpack (= 7.2.1)
29+
actionview (= 7.2.1)
30+
activejob (= 7.2.1)
31+
activesupport (= 7.2.1)
32+
mail (>= 2.8.0)
3933
rails-dom-testing (~> 2.2)
40-
actionpack (7.1.3.4)
41-
actionview (= 7.1.3.4)
42-
activesupport (= 7.1.3.4)
34+
actionpack (7.2.1)
35+
actionview (= 7.2.1)
36+
activesupport (= 7.2.1)
4337
nokogiri (>= 1.8.5)
4438
racc
45-
rack (>= 2.2.4)
39+
rack (>= 2.2.4, < 3.2)
4640
rack-session (>= 1.0.1)
4741
rack-test (>= 0.6.3)
4842
rails-dom-testing (~> 2.2)
4943
rails-html-sanitizer (~> 1.6)
50-
actiontext (7.1.3.4)
51-
actionpack (= 7.1.3.4)
52-
activerecord (= 7.1.3.4)
53-
activestorage (= 7.1.3.4)
54-
activesupport (= 7.1.3.4)
44+
useragent (~> 0.16)
45+
actiontext (7.2.1)
46+
actionpack (= 7.2.1)
47+
activerecord (= 7.2.1)
48+
activestorage (= 7.2.1)
49+
activesupport (= 7.2.1)
5550
globalid (>= 0.6.0)
5651
nokogiri (>= 1.8.5)
57-
actionview (7.1.3.4)
58-
activesupport (= 7.1.3.4)
52+
actionview (7.2.1)
53+
activesupport (= 7.2.1)
5954
builder (~> 3.1)
6055
erubi (~> 1.11)
6156
rails-dom-testing (~> 2.2)
6257
rails-html-sanitizer (~> 1.6)
63-
activejob (7.1.3.4)
64-
activesupport (= 7.1.3.4)
58+
activejob (7.2.1)
59+
activesupport (= 7.2.1)
6560
globalid (>= 0.3.6)
66-
activemodel (7.1.3.4)
67-
activesupport (= 7.1.3.4)
68-
activerecord (7.1.3.4)
69-
activemodel (= 7.1.3.4)
70-
activesupport (= 7.1.3.4)
61+
activemodel (7.2.1)
62+
activesupport (= 7.2.1)
63+
activerecord (7.2.1)
64+
activemodel (= 7.2.1)
65+
activesupport (= 7.2.1)
7166
timeout (>= 0.4.0)
72-
activestorage (7.1.3.4)
73-
actionpack (= 7.1.3.4)
74-
activejob (= 7.1.3.4)
75-
activerecord (= 7.1.3.4)
76-
activesupport (= 7.1.3.4)
67+
activestorage (7.2.1)
68+
actionpack (= 7.2.1)
69+
activejob (= 7.2.1)
70+
activerecord (= 7.2.1)
71+
activesupport (= 7.2.1)
7772
marcel (~> 1.0)
78-
activesupport (7.1.3.4)
73+
activesupport (7.2.1)
7974
base64
8075
bigdecimal
81-
concurrent-ruby (~> 1.0, >= 1.0.2)
76+
concurrent-ruby (~> 1.0, >= 1.3.1)
8277
connection_pool (>= 2.2.5)
8378
drb
8479
i18n (>= 1.6, < 2)
80+
logger (>= 1.4.2)
8581
minitest (>= 5.1)
86-
mutex_m
87-
tzinfo (~> 2.0)
82+
securerandom (>= 0.3)
83+
tzinfo (~> 2.0, >= 2.0.5)
8884
ast (2.4.2)
8985
base64 (0.2.0)
9086
bigdecimal (3.1.8)
9187
builder (3.3.0)
9288
byebug (11.1.3)
93-
concurrent-ruby (1.3.3)
89+
concurrent-ruby (1.3.4)
9490
connection_pool (2.4.1)
9591
crass (1.0.6)
9692
date (3.3.4)
@@ -107,6 +103,7 @@ GEM
107103
reline (>= 0.4.2)
108104
json (2.7.2)
109105
language_server-protocol (3.17.0.3)
106+
logger (1.6.0)
110107
loofah (2.22.0)
111108
crass (~> 1.0.2)
112109
nokogiri (>= 1.12.0)
@@ -118,9 +115,8 @@ GEM
118115
marcel (1.0.4)
119116
mini_mime (1.1.5)
120117
mini_portile2 (2.8.7)
121-
minitest (5.24.1)
122-
mutex_m (0.2.0)
123-
net-imap (0.4.14)
118+
minitest (5.25.1)
119+
net-imap (0.4.15)
124120
date
125121
net-protocol
126122
net-pop (0.1.2)
@@ -130,18 +126,18 @@ GEM
130126
net-smtp (0.5.0)
131127
net-protocol
132128
nio4r (2.7.3)
133-
nokogiri (1.16.6)
129+
nokogiri (1.16.7)
134130
mini_portile2 (~> 2.8.2)
135131
racc (~> 1.4)
136132
package_json (0.1.0)
137-
parallel (1.25.1)
138-
parser (3.3.3.0)
133+
parallel (1.26.3)
134+
parser (3.3.4.2)
139135
ast (~> 2.4.1)
140136
racc
141137
psych (5.1.2)
142138
stringio
143-
racc (1.8.0)
144-
rack (3.1.6)
139+
racc (1.8.1)
140+
rack (3.1.7)
145141
rack-proxy (0.7.7)
146142
rack
147143
rack-session (2.0.0)
@@ -151,31 +147,31 @@ GEM
151147
rackup (2.1.0)
152148
rack (>= 3)
153149
webrick (~> 1.8)
154-
rails (7.1.3.4)
155-
actioncable (= 7.1.3.4)
156-
actionmailbox (= 7.1.3.4)
157-
actionmailer (= 7.1.3.4)
158-
actionpack (= 7.1.3.4)
159-
actiontext (= 7.1.3.4)
160-
actionview (= 7.1.3.4)
161-
activejob (= 7.1.3.4)
162-
activemodel (= 7.1.3.4)
163-
activerecord (= 7.1.3.4)
164-
activestorage (= 7.1.3.4)
165-
activesupport (= 7.1.3.4)
150+
rails (7.2.1)
151+
actioncable (= 7.2.1)
152+
actionmailbox (= 7.2.1)
153+
actionmailer (= 7.2.1)
154+
actionpack (= 7.2.1)
155+
actiontext (= 7.2.1)
156+
actionview (= 7.2.1)
157+
activejob (= 7.2.1)
158+
activemodel (= 7.2.1)
159+
activerecord (= 7.2.1)
160+
activestorage (= 7.2.1)
161+
activesupport (= 7.2.1)
166162
bundler (>= 1.15.0)
167-
railties (= 7.1.3.4)
163+
railties (= 7.2.1)
168164
rails-dom-testing (2.2.0)
169165
activesupport (>= 5.0.0)
170166
minitest
171167
nokogiri (>= 1.6)
172168
rails-html-sanitizer (1.6.0)
173169
loofah (~> 2.21)
174170
nokogiri (~> 1.14)
175-
railties (7.1.3.4)
176-
actionpack (= 7.1.3.4)
177-
activesupport (= 7.1.3.4)
178-
irb
171+
railties (7.2.1)
172+
actionpack (= 7.2.1)
173+
activesupport (= 7.2.1)
174+
irb (~> 1.13)
179175
rackup (>= 1.0.0)
180176
rake (>= 12.2)
181177
thor (~> 1.0, >= 1.2.2)
@@ -187,11 +183,9 @@ GEM
187183
regexp_parser (2.9.2)
188184
reline (0.5.9)
189185
io-console (~> 0.5)
190-
rexml (3.3.1)
191-
strscan
192186
rspec-core (3.13.0)
193187
rspec-support (~> 3.13.0)
194-
rspec-expectations (3.13.1)
188+
rspec-expectations (3.13.2)
195189
diff-lcs (>= 1.2.0, < 2.0)
196190
rspec-support (~> 3.13.0)
197191
rspec-mocks (3.13.1)
@@ -206,36 +200,36 @@ GEM
206200
rspec-mocks (~> 3.12)
207201
rspec-support (~> 3.12)
208202
rspec-support (3.13.1)
209-
rubocop (1.64.1)
203+
rubocop (1.66.0)
210204
json (~> 2.3)
211205
language_server-protocol (>= 3.17.0)
212206
parallel (~> 1.10)
213207
parser (>= 3.3.0.2)
214208
rainbow (>= 2.2.2, < 4.0)
215-
regexp_parser (>= 1.8, < 3.0)
216-
rexml (>= 3.2.5, < 4.0)
217-
rubocop-ast (>= 1.31.1, < 2.0)
209+
regexp_parser (>= 2.4, < 3.0)
210+
rubocop-ast (>= 1.32.1, < 2.0)
218211
ruby-progressbar (~> 1.7)
219212
unicode-display_width (>= 2.4.0, < 3.0)
220-
rubocop-ast (1.31.3)
213+
rubocop-ast (1.32.1)
221214
parser (>= 3.3.1.0)
222215
rubocop-performance (1.21.1)
223216
rubocop (>= 1.48.1, < 2.0)
224217
rubocop-ast (>= 1.31.1, < 2.0)
225218
ruby-progressbar (1.13.0)
219+
securerandom (0.3.1)
226220
semantic_range (3.0.0)
227221
stringio (3.1.1)
228-
strscan (3.1.0)
229-
thor (1.3.1)
222+
thor (1.3.2)
230223
timeout (0.4.1)
231224
tzinfo (2.0.6)
232225
concurrent-ruby (~> 1.0)
233226
unicode-display_width (2.5.0)
227+
useragent (0.16.10)
234228
webrick (1.8.1)
235229
websocket-driver (0.7.6)
236230
websocket-extensions (>= 0.1.0)
237231
websocket-extensions (0.1.5)
238-
zeitwerk (2.6.16)
232+
zeitwerk (2.6.17)
239233

240234
PLATFORMS
241235
ruby
@@ -254,4 +248,4 @@ DEPENDENCIES
254248
shakapacker!
255249

256250
BUNDLED WITH
257-
2.5.9
251+
2.5.18

gemfiles/Gemfile-rails.6.0.x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "https://rubygems.org"
22

33
gemspec path: "../"
44

5-
gem "rails", "~> 6.0.0.rc2"
5+
gem "rails", "~> 6.0.0"
66
gem "rake", ">= 11.1"
77
gem "rack-proxy", require: false
88
gem "rspec-rails", "~> 5.0.0"

gemfiles/Gemfile-rails.6.1.x

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55
gemspec path: "../"
66

77
gem "rails", '~>6.1.0'
8-
gem "arel", github: "rails/arel"
98
gem "rake", ">= 11.1"
109
gem "rack-proxy", require: false
1110
gem "rspec-rails", "~> 6.0.0"

gemfiles/Gemfile-rails.7.0.x

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55
gemspec path: "../"
66

77
gem "rails", '~>7.0.0'
8-
gem "arel", github: "rails/arel"
98
gem "rake", ">= 11.1"
109
gem "rack-proxy", require: false
1110
gem "rspec-rails", "~> 6.0.0"

gemfiles/Gemfile-rails.7.1.x

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55
gemspec path: "../"
66

77
gem "rails", '~>7.1.0'
8-
gem "arel", github: "rails/arel"
98
gem "rake", ">= 11.1"
109
gem "rack-proxy", require: false
1110
gem "rspec-rails", "~> 6.0.0"

gemfiles/Gemfile-rails.7.2.x

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
source "https://rubygems.org"
2+
3+
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
4+
5+
gemspec path: "../"
6+
7+
gem "rails", '~>7.2.0'
8+
gem "rake", ">= 11.1"
9+
gem "rack-proxy", require: false
10+
gem "rspec-rails", "~> 6.0.0"
11+
gem "byebug"

spec/dummy/yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4060,7 +4060,7 @@ [email protected]:
40604060
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
40614061

40624062
"shakapacker@file:.yalc/shakapacker":
4063-
version "8.0.1"
4063+
version "8.0.2"
40644064
dependencies:
40654065
js-yaml "^4.1.0"
40664066
path-complete-extname "^1.0.0"

0 commit comments

Comments
 (0)