Skip to content

Commit 7f9ab66

Browse files
authored
Merge pull request #201 from rails/rm-fix-ci
Fix CI
2 parents 93ee463 + 7b374bb commit 7f9ab66

11 files changed

+662
-130
lines changed

.github/workflows/ci.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ jobs:
1212
- "3.2"
1313
gemfile:
1414
- Gemfile
15-
- gemfiles/rails_7_propshaft.gemfile
16-
- gemfiles/rails_7_sprockets.gemfile
15+
- gemfiles/rails_7_0_propshaft.gemfile
16+
- gemfiles/rails_7_1_propshaft.gemfile
17+
- gemfiles/rails_7_0_sprockets.gemfile
18+
- gemfiles/rails_7_1_sprockets.gemfile
1719
continue-on-error: [ false ]
1820

1921
name: ${{ format('Tests (Ruby {0}, {1})', matrix.ruby-version, matrix.gemfile) }}
@@ -26,6 +28,10 @@ jobs:
2628
steps:
2729
- uses: actions/checkout@v3
2830

31+
- name: Remove Gemfile lock
32+
run: |
33+
rm $BUNDLE_GEMFILE.lock
34+
2935
- name: Install Ruby
3036
uses: ruby/setup-ruby@v1
3137
with:

Appraisals

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
appraise "rails_7_sprockets" do
1+
appraise "rails_7_0_sprockets" do
22
gem "rails", "~> 7.0.0"
33
gem "sprockets-rails"
44
end
55

6-
appraise "rails_7_propshaft" do
6+
appraise "rails_7_0_propshaft" do
77
gem "rails", "~> 7.0.0"
88
gem "propshaft"
99
end
10+
11+
appraise "rails_7_1_sprockets" do
12+
gem "rails", "~> 7.1.0"
13+
gem "sprockets-rails"
14+
end
15+
16+
appraise "rails_7_1_propshaft" do
17+
gem "rails", "~> 7.1.0"
18+
gem "propshaft"
19+
end

Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ GEM
6969
zeitwerk (~> 2.3)
7070
addressable (2.8.0)
7171
public_suffix (>= 2.0.2, < 5.0)
72-
appraisal (2.4.1)
72+
appraisal (2.5.0)
7373
bundler
7474
rake
7575
thor (>= 0.14.0)
@@ -161,7 +161,7 @@ GEM
161161
sqlite3 (1.4.4)
162162
stimulus-rails (1.0.4)
163163
railties (>= 6.0.0)
164-
thor (1.2.1)
164+
thor (1.3.0)
165165
turbo-rails (1.1.1)
166166
actionpack (>= 6.0.0)
167167
activejob (>= 6.0.0)

gemfiles/rails_7_propshaft.gemfile.lock renamed to gemfiles/rails_7_0_propshaft.gemfile.lock

+50-61
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ..
33
specs:
4-
importmap-rails (1.2.1)
4+
importmap-rails (1.2.2)
55
actionpack (>= 6.0.0)
66
railties (>= 6.0.0)
77

@@ -73,15 +73,15 @@ GEM
7373
i18n (>= 1.6, < 2)
7474
minitest (>= 5.1)
7575
tzinfo (~> 2.0)
76-
addressable (2.8.0)
77-
public_suffix (>= 2.0.2, < 5.0)
78-
appraisal (2.4.1)
76+
addressable (2.8.5)
77+
public_suffix (>= 2.0.2, < 6.0)
78+
appraisal (2.5.0)
7979
bundler
8080
rake
8181
thor (>= 0.14.0)
8282
builder (3.2.4)
8383
byebug (11.1.3)
84-
capybara (3.37.1)
84+
capybara (3.39.2)
8585
addressable
8686
matrix
8787
mini_mime (>= 0.1.3)
@@ -90,55 +90,48 @@ GEM
9090
rack-test (>= 0.6.3)
9191
regexp_parser (>= 1.5, < 3.0)
9292
xpath (~> 3.2)
93-
childprocess (4.1.0)
94-
concurrent-ruby (1.1.10)
93+
concurrent-ruby (1.2.2)
9594
crass (1.0.6)
96-
digest (3.1.0)
97-
erubi (1.10.0)
98-
globalid (1.0.0)
99-
activesupport (>= 5.0)
100-
i18n (1.10.0)
95+
date (3.3.3)
96+
erubi (1.12.0)
97+
globalid (1.2.1)
98+
activesupport (>= 6.1)
99+
i18n (1.14.1)
101100
concurrent-ruby (~> 1.0)
102-
loofah (2.18.0)
101+
loofah (2.21.4)
103102
crass (~> 1.0.2)
104-
nokogiri (>= 1.5.9)
105-
mail (2.7.1)
103+
nokogiri (>= 1.12.0)
104+
mail (2.8.1)
106105
mini_mime (>= 0.1.1)
106+
net-imap
107+
net-pop
108+
net-smtp
107109
marcel (1.0.2)
108110
matrix (0.4.2)
109111
method_source (1.0.0)
110-
mini_mime (1.1.2)
111-
minitest (5.16.2)
112-
net-imap (0.2.3)
113-
digest
112+
mini_mime (1.1.5)
113+
minitest (5.20.0)
114+
net-imap (0.4.2)
115+
date
114116
net-protocol
115-
strscan
116-
net-pop (0.1.1)
117-
digest
117+
net-pop (0.1.2)
118118
net-protocol
119+
net-protocol (0.2.1)
119120
timeout
120-
net-protocol (0.1.3)
121-
timeout
122-
net-smtp (0.3.1)
123-
digest
121+
net-smtp (0.4.0)
124122
net-protocol
125-
timeout
126-
nio4r (2.5.8)
127-
nokogiri (1.14.0-arm64-darwin)
128-
racc (~> 1.4)
129-
nokogiri (1.14.0-x86_64-darwin)
130-
racc (~> 1.4)
131-
nokogiri (1.14.0-x86_64-linux)
123+
nio4r (2.5.9)
124+
nokogiri (1.15.4-aarch64-linux)
132125
racc (~> 1.4)
133126
propshaft (0.6.4)
134127
actionpack (>= 7.0.0)
135128
activesupport (>= 7.0.0)
136129
rack
137130
railties (>= 7.0.0)
138-
public_suffix (4.0.7)
139-
racc (1.6.2)
131+
public_suffix (5.0.3)
132+
racc (1.7.1)
140133
rack (2.2.4)
141-
rack-test (2.0.2)
134+
rack-test (2.1.0)
142135
rack (>= 1.3)
143136
rails (7.0.3)
144137
actioncable (= 7.0.3)
@@ -154,11 +147,13 @@ GEM
154147
activesupport (= 7.0.3)
155148
bundler (>= 1.15.0)
156149
railties (= 7.0.3)
157-
rails-dom-testing (2.0.3)
158-
activesupport (>= 4.2.0)
150+
rails-dom-testing (2.2.0)
151+
activesupport (>= 5.0.0)
152+
minitest
159153
nokogiri (>= 1.6)
160-
rails-html-sanitizer (1.4.3)
161-
loofah (~> 2.3)
154+
rails-html-sanitizer (1.6.0)
155+
loofah (~> 2.21)
156+
nokogiri (~> 1.14)
162157
railties (7.0.3)
163158
actionpack (= 7.0.3)
164159
activesupport (= 7.0.3)
@@ -167,44 +162,38 @@ GEM
167162
thor (~> 1.0)
168163
zeitwerk (~> 2.5)
169164
rake (13.0.6)
170-
regexp_parser (2.5.0)
171-
rexml (3.2.5)
165+
regexp_parser (2.8.2)
166+
rexml (3.2.6)
172167
rubyzip (2.3.2)
173-
selenium-webdriver (4.3.0)
174-
childprocess (>= 0.5, < 5.0)
168+
selenium-webdriver (4.10.0)
175169
rexml (~> 3.2, >= 3.2.5)
176170
rubyzip (>= 1.2.2, < 3.0)
177171
websocket (~> 1.0)
178-
sqlite3 (1.4.4)
179-
stimulus-rails (1.0.4)
172+
sqlite3 (1.6.7-aarch64-linux)
173+
stimulus-rails (1.3.0)
180174
railties (>= 6.0.0)
181-
strscan (3.0.3)
182-
thor (1.2.1)
183-
timeout (0.3.0)
184-
turbo-rails (1.1.1)
175+
thor (1.3.0)
176+
timeout (0.4.0)
177+
turbo-rails (1.5.0)
185178
actionpack (>= 6.0.0)
186179
activejob (>= 6.0.0)
187180
railties (>= 6.0.0)
188-
tzinfo (2.0.4)
181+
tzinfo (2.0.6)
189182
concurrent-ruby (~> 1.0)
190-
webdrivers (5.0.0)
183+
webdrivers (5.3.1)
191184
nokogiri (~> 1.6)
192185
rubyzip (>= 1.3.0)
193-
selenium-webdriver (~> 4.0)
194-
websocket (1.2.9)
195-
websocket-driver (0.7.5)
186+
selenium-webdriver (~> 4.0, < 4.11)
187+
websocket (1.2.10)
188+
websocket-driver (0.7.6)
196189
websocket-extensions (>= 0.1.0)
197190
websocket-extensions (0.1.5)
198191
xpath (3.2.0)
199192
nokogiri (~> 1.8)
200-
zeitwerk (2.6.0)
193+
zeitwerk (2.6.12)
201194

202195
PLATFORMS
203-
arm64-darwin-21
204-
arm64-darwin-22
205-
x86_64-darwin-21
206-
x86_64-darwin-22
207-
x86_64-linux
196+
aarch64-linux
208197

209198
DEPENDENCIES
210199
appraisal

0 commit comments

Comments
 (0)