Skip to content

Commit f81889a

Browse files
rafaelfrancarafaelfranca
authored
Merge pull request #138 from skipkayhil/add-ruby-31-ci
Update CI for ruby 3.1 and latest Rails releases
2 parents 624d773 + d16f6c0 commit f81889a

File tree

7 files changed

+327
-258
lines changed

7 files changed

+327
-258
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ jobs:
77
ruby-version:
88
- "2.7"
99
- "3.0"
10+
- "3.1"
1011
gemfile:
1112
- Gemfile
1213
- gemfiles/rails_7_propshaft.gemfile

‎Appraisals

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
appraise "rails_7_sprockets" do
2-
gem "rails", "7.0.0.rc1"
2+
gem "rails", "~> 7.0.0"
33
gem "sprockets-rails"
44
end
55

66
appraise "rails_7_propshaft" do
7-
gem "rails", "7.0.0.rc1"
7+
gem "rails", "~> 7.0.0"
88
gem "propshaft"
99
end

‎Gemfile.lock

Lines changed: 102 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -8,60 +8,60 @@ PATH
88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actioncable (6.1.3.1)
12-
actionpack (= 6.1.3.1)
13-
activesupport (= 6.1.3.1)
11+
actioncable (6.1.6)
12+
actionpack (= 6.1.6)
13+
activesupport (= 6.1.6)
1414
nio4r (~> 2.0)
1515
websocket-driver (>= 0.6.1)
16-
actionmailbox (6.1.3.1)
17-
actionpack (= 6.1.3.1)
18-
activejob (= 6.1.3.1)
19-
activerecord (= 6.1.3.1)
20-
activestorage (= 6.1.3.1)
21-
activesupport (= 6.1.3.1)
16+
actionmailbox (6.1.6)
17+
actionpack (= 6.1.6)
18+
activejob (= 6.1.6)
19+
activerecord (= 6.1.6)
20+
activestorage (= 6.1.6)
21+
activesupport (= 6.1.6)
2222
mail (>= 2.7.1)
23-
actionmailer (6.1.3.1)
24-
actionpack (= 6.1.3.1)
25-
actionview (= 6.1.3.1)
26-
activejob (= 6.1.3.1)
27-
activesupport (= 6.1.3.1)
23+
actionmailer (6.1.6)
24+
actionpack (= 6.1.6)
25+
actionview (= 6.1.6)
26+
activejob (= 6.1.6)
27+
activesupport (= 6.1.6)
2828
mail (~> 2.5, >= 2.5.4)
2929
rails-dom-testing (~> 2.0)
30-
actionpack (6.1.3.1)
31-
actionview (= 6.1.3.1)
32-
activesupport (= 6.1.3.1)
30+
actionpack (6.1.6)
31+
actionview (= 6.1.6)
32+
activesupport (= 6.1.6)
3333
rack (~> 2.0, >= 2.0.9)
3434
rack-test (>= 0.6.3)
3535
rails-dom-testing (~> 2.0)
3636
rails-html-sanitizer (~> 1.0, >= 1.2.0)
37-
actiontext (6.1.3.1)
38-
actionpack (= 6.1.3.1)
39-
activerecord (= 6.1.3.1)
40-
activestorage (= 6.1.3.1)
41-
activesupport (= 6.1.3.1)
37+
actiontext (6.1.6)
38+
actionpack (= 6.1.6)
39+
activerecord (= 6.1.6)
40+
activestorage (= 6.1.6)
41+
activesupport (= 6.1.6)
4242
nokogiri (>= 1.8.5)
43-
actionview (6.1.3.1)
44-
activesupport (= 6.1.3.1)
43+
actionview (6.1.6)
44+
activesupport (= 6.1.6)
4545
builder (~> 3.1)
4646
erubi (~> 1.4)
4747
rails-dom-testing (~> 2.0)
4848
rails-html-sanitizer (~> 1.1, >= 1.2.0)
49-
activejob (6.1.3.1)
50-
activesupport (= 6.1.3.1)
49+
activejob (6.1.6)
50+
activesupport (= 6.1.6)
5151
globalid (>= 0.3.6)
52-
activemodel (6.1.3.1)
53-
activesupport (= 6.1.3.1)
54-
activerecord (6.1.3.1)
55-
activemodel (= 6.1.3.1)
56-
activesupport (= 6.1.3.1)
57-
activestorage (6.1.3.1)
58-
actionpack (= 6.1.3.1)
59-
activejob (= 6.1.3.1)
60-
activerecord (= 6.1.3.1)
61-
activesupport (= 6.1.3.1)
62-
marcel (~> 1.0.0)
63-
mini_mime (~> 1.0.2)
64-
activesupport (6.1.3.1)
52+
activemodel (6.1.6)
53+
activesupport (= 6.1.6)
54+
activerecord (6.1.6)
55+
activemodel (= 6.1.6)
56+
activesupport (= 6.1.6)
57+
activestorage (6.1.6)
58+
actionpack (= 6.1.6)
59+
activejob (= 6.1.6)
60+
activerecord (= 6.1.6)
61+
activesupport (= 6.1.6)
62+
marcel (~> 1.0)
63+
mini_mime (>= 1.1.0)
64+
activesupport (6.1.6)
6565
concurrent-ruby (~> 1.0, >= 1.0.2)
6666
i18n (>= 1.6, < 2)
6767
minitest (>= 5.1)
@@ -75,99 +75,108 @@ GEM
7575
thor (>= 0.14.0)
7676
builder (3.2.4)
7777
byebug (11.1.3)
78-
capybara (3.35.3)
78+
capybara (3.37.1)
7979
addressable
80+
matrix
8081
mini_mime (>= 0.1.3)
8182
nokogiri (~> 1.8)
8283
rack (>= 1.6.0)
8384
rack-test (>= 0.6.3)
8485
regexp_parser (>= 1.5, < 3.0)
8586
xpath (~> 3.2)
86-
childprocess (3.0.0)
87-
concurrent-ruby (1.1.9)
87+
childprocess (4.1.0)
88+
concurrent-ruby (1.1.10)
8889
crass (1.0.6)
8990
erubi (1.10.0)
90-
globalid (0.5.1)
91+
globalid (1.0.0)
9192
activesupport (>= 5.0)
92-
i18n (1.8.10)
93+
i18n (1.10.0)
9394
concurrent-ruby (~> 1.0)
94-
loofah (2.10.0)
95+
loofah (2.18.0)
9596
crass (~> 1.0.2)
9697
nokogiri (>= 1.5.9)
9798
mail (2.7.1)
9899
mini_mime (>= 0.1.1)
99-
marcel (1.0.1)
100+
marcel (1.0.2)
101+
matrix (0.4.2)
100102
method_source (1.0.0)
101-
mini_mime (1.0.3)
102-
mini_portile2 (2.5.3)
103-
minitest (5.14.4)
104-
nio4r (2.5.7)
105-
nokogiri (1.11.7)
106-
mini_portile2 (~> 2.5.0)
103+
mini_mime (1.1.2)
104+
minitest (5.16.2)
105+
nio4r (2.5.8)
106+
nokogiri (1.13.6-arm64-darwin)
107107
racc (~> 1.4)
108-
public_suffix (4.0.6)
109-
racc (1.5.2)
110-
rack (2.2.3)
111-
rack-test (1.1.0)
112-
rack (>= 1.0, < 3)
113-
rails (6.1.3.1)
114-
actioncable (= 6.1.3.1)
115-
actionmailbox (= 6.1.3.1)
116-
actionmailer (= 6.1.3.1)
117-
actionpack (= 6.1.3.1)
118-
actiontext (= 6.1.3.1)
119-
actionview (= 6.1.3.1)
120-
activejob (= 6.1.3.1)
121-
activemodel (= 6.1.3.1)
122-
activerecord (= 6.1.3.1)
123-
activestorage (= 6.1.3.1)
124-
activesupport (= 6.1.3.1)
108+
nokogiri (1.13.6-x86_64-darwin)
109+
racc (~> 1.4)
110+
nokogiri (1.13.6-x86_64-linux)
111+
racc (~> 1.4)
112+
public_suffix (4.0.7)
113+
racc (1.6.0)
114+
rack (2.2.4)
115+
rack-test (2.0.2)
116+
rack (>= 1.3)
117+
rails (6.1.6)
118+
actioncable (= 6.1.6)
119+
actionmailbox (= 6.1.6)
120+
actionmailer (= 6.1.6)
121+
actionpack (= 6.1.6)
122+
actiontext (= 6.1.6)
123+
actionview (= 6.1.6)
124+
activejob (= 6.1.6)
125+
activemodel (= 6.1.6)
126+
activerecord (= 6.1.6)
127+
activestorage (= 6.1.6)
128+
activesupport (= 6.1.6)
125129
bundler (>= 1.15.0)
126-
railties (= 6.1.3.1)
130+
railties (= 6.1.6)
127131
sprockets-rails (>= 2.0.0)
128132
rails-dom-testing (2.0.3)
129133
activesupport (>= 4.2.0)
130134
nokogiri (>= 1.6)
131-
rails-html-sanitizer (1.3.0)
135+
rails-html-sanitizer (1.4.3)
132136
loofah (~> 2.3)
133-
railties (6.1.3.1)
134-
actionpack (= 6.1.3.1)
135-
activesupport (= 6.1.3.1)
137+
railties (6.1.6)
138+
actionpack (= 6.1.6)
139+
activesupport (= 6.1.6)
136140
method_source
137-
rake (>= 0.8.7)
141+
rake (>= 12.2)
138142
thor (~> 1.0)
139143
rake (13.0.6)
140-
regexp_parser (2.1.1)
144+
regexp_parser (2.5.0)
141145
rexml (3.2.5)
142146
rubyzip (2.3.2)
143-
selenium-webdriver (3.142.7)
144-
childprocess (>= 0.5, < 4.0)
145-
rubyzip (>= 1.2.2)
146-
sprockets (4.0.2)
147+
selenium-webdriver (4.3.0)
148+
childprocess (>= 0.5, < 5.0)
149+
rexml (~> 3.2, >= 3.2.5)
150+
rubyzip (>= 1.2.2, < 3.0)
151+
websocket (~> 1.0)
152+
sprockets (4.1.1)
147153
concurrent-ruby (~> 1.0)
148154
rack (> 1, < 3)
149-
sprockets-rails (3.2.2)
150-
actionpack (>= 4.0)
151-
activesupport (>= 4.0)
155+
sprockets-rails (3.4.2)
156+
actionpack (>= 5.2)
157+
activesupport (>= 5.2)
152158
sprockets (>= 3.0.0)
153-
sqlite3 (1.4.2)
154-
stimulus-rails (0.3.8)
155-
rails (>= 6.0.0)
156-
thor (1.1.0)
157-
turbo-rails (0.7.4)
158-
rails (>= 6.0.0)
159+
sqlite3 (1.4.4)
160+
stimulus-rails (1.0.4)
161+
railties (>= 6.0.0)
162+
thor (1.2.1)
163+
turbo-rails (1.1.1)
164+
actionpack (>= 6.0.0)
165+
activejob (>= 6.0.0)
166+
railties (>= 6.0.0)
159167
tzinfo (2.0.4)
160168
concurrent-ruby (~> 1.0)
161-
webdrivers (4.6.0)
169+
webdrivers (5.0.0)
162170
nokogiri (~> 1.6)
163171
rubyzip (>= 1.3.0)
164-
selenium-webdriver (>= 3.0, < 4.0)
172+
selenium-webdriver (~> 4.0)
173+
websocket (1.2.9)
165174
websocket-driver (0.7.5)
166175
websocket-extensions (>= 0.1.0)
167176
websocket-extensions (0.1.5)
168177
xpath (3.2.0)
169178
nokogiri (~> 1.8)
170-
zeitwerk (2.4.2)
179+
zeitwerk (2.6.0)
171180

172181
PLATFORMS
173182
arm64-darwin-20
@@ -190,4 +199,4 @@ DEPENDENCIES
190199
webdrivers
191200

192201
BUNDLED WITH
193-
2.2.33
202+
2.3.17

‎gemfiles/rails_7_propshaft.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "7.0.0.rc1"
5+
gem "rails", "~> 7.0.0"
66
gem "sqlite3"
77
gem "propshaft"
88

0 commit comments

Comments
 (0)