Skip to content

Commit 7f124c7

Browse files
G-RathG-Rath
authored
ci: revert lockfile updates and don't allow lockfile updates when installing (#1328)
* ci: don't allow lockfile updates when installing * Revert "Merge pull request #1302 from G-Rath/update-lockfiles" This reverts commit 230e3f6, reversing changes made to f59b5b3. * fix: update `mini_racer`
1 parent 8a3126d commit 7f124c7

File tree

6 files changed

+392
-412
lines changed

6 files changed

+392
-412
lines changed

‎.github/workflows/ruby.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
path: test/dummy/vendor/bundle
9999
key: dummy-app-gem-cache-${{ hashFiles('${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile.lock') }}
100100
- name: Install Ruby Gems for dummy app
101-
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=test/dummy/vendor/bundle || bundle _2.4.9_ install --path=test/dummy/vendor/bundle --jobs=4 --retry=3
101+
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=test/dummy/vendor/bundle || bundle _2.4.9_ install --frozen --path=test/dummy/vendor/bundle --jobs=4 --retry=3
102102
- run: cd test/dummy && yalc add react_ujs && yarn
103103
- run: bundle exec rake test
104104
env:

‎gemfiles/base.gemfile.lock

+81-85
Original file line numberDiff line numberDiff line change
@@ -11,74 +11,74 @@ PATH
1111
GEM
1212
remote: http://rubygems.org/
1313
specs:
14-
actioncable (7.0.7)
15-
actionpack (= 7.0.7)
16-
activesupport (= 7.0.7)
14+
actioncable (7.0.4.3)
15+
actionpack (= 7.0.4.3)
16+
activesupport (= 7.0.4.3)
1717
nio4r (~> 2.0)
1818
websocket-driver (>= 0.6.1)
19-
actionmailbox (7.0.7)
20-
actionpack (= 7.0.7)
21-
activejob (= 7.0.7)
22-
activerecord (= 7.0.7)
23-
activestorage (= 7.0.7)
24-
activesupport (= 7.0.7)
19+
actionmailbox (7.0.4.3)
20+
actionpack (= 7.0.4.3)
21+
activejob (= 7.0.4.3)
22+
activerecord (= 7.0.4.3)
23+
activestorage (= 7.0.4.3)
24+
activesupport (= 7.0.4.3)
2525
mail (>= 2.7.1)
2626
net-imap
2727
net-pop
2828
net-smtp
29-
actionmailer (7.0.7)
30-
actionpack (= 7.0.7)
31-
actionview (= 7.0.7)
32-
activejob (= 7.0.7)
33-
activesupport (= 7.0.7)
29+
actionmailer (7.0.4.3)
30+
actionpack (= 7.0.4.3)
31+
actionview (= 7.0.4.3)
32+
activejob (= 7.0.4.3)
33+
activesupport (= 7.0.4.3)
3434
mail (~> 2.5, >= 2.5.4)
3535
net-imap
3636
net-pop
3737
net-smtp
3838
rails-dom-testing (~> 2.0)
39-
actionpack (7.0.7)
40-
actionview (= 7.0.7)
41-
activesupport (= 7.0.7)
42-
rack (~> 2.0, >= 2.2.4)
39+
actionpack (7.0.4.3)
40+
actionview (= 7.0.4.3)
41+
activesupport (= 7.0.4.3)
42+
rack (~> 2.0, >= 2.2.0)
4343
rack-test (>= 0.6.3)
4444
rails-dom-testing (~> 2.0)
4545
rails-html-sanitizer (~> 1.0, >= 1.2.0)
46-
actiontext (7.0.7)
47-
actionpack (= 7.0.7)
48-
activerecord (= 7.0.7)
49-
activestorage (= 7.0.7)
50-
activesupport (= 7.0.7)
46+
actiontext (7.0.4.3)
47+
actionpack (= 7.0.4.3)
48+
activerecord (= 7.0.4.3)
49+
activestorage (= 7.0.4.3)
50+
activesupport (= 7.0.4.3)
5151
globalid (>= 0.6.0)
5252
nokogiri (>= 1.8.5)
53-
actionview (7.0.7)
54-
activesupport (= 7.0.7)
53+
actionview (7.0.4.3)
54+
activesupport (= 7.0.4.3)
5555
builder (~> 3.1)
5656
erubi (~> 1.4)
5757
rails-dom-testing (~> 2.0)
5858
rails-html-sanitizer (~> 1.1, >= 1.2.0)
59-
activejob (7.0.7)
60-
activesupport (= 7.0.7)
59+
activejob (7.0.4.3)
60+
activesupport (= 7.0.4.3)
6161
globalid (>= 0.3.6)
62-
activemodel (7.0.7)
63-
activesupport (= 7.0.7)
64-
activerecord (7.0.7)
65-
activemodel (= 7.0.7)
66-
activesupport (= 7.0.7)
67-
activestorage (7.0.7)
68-
actionpack (= 7.0.7)
69-
activejob (= 7.0.7)
70-
activerecord (= 7.0.7)
71-
activesupport (= 7.0.7)
62+
activemodel (7.0.4.3)
63+
activesupport (= 7.0.4.3)
64+
activerecord (7.0.4.3)
65+
activemodel (= 7.0.4.3)
66+
activesupport (= 7.0.4.3)
67+
activestorage (7.0.4.3)
68+
actionpack (= 7.0.4.3)
69+
activejob (= 7.0.4.3)
70+
activerecord (= 7.0.4.3)
71+
activesupport (= 7.0.4.3)
7272
marcel (~> 1.0)
7373
mini_mime (>= 1.1.0)
74-
activesupport (7.0.7)
74+
activesupport (7.0.4.3)
7575
concurrent-ruby (~> 1.0, >= 1.0.2)
7676
i18n (>= 1.6, < 2)
7777
minitest (>= 5.1)
7878
tzinfo (~> 2.0)
79-
addressable (2.8.5)
79+
addressable (2.8.1)
8080
public_suffix (>= 2.0.2, < 6.0)
81-
appraisal (2.5.0)
81+
appraisal (2.4.1)
8282
bundler
8383
rake
8484
thor (>= 0.14.0)
@@ -88,7 +88,7 @@ GEM
8888
execjs (~> 2.0)
8989
builder (3.2.4)
9090
byebug (11.1.3)
91-
capybara (3.39.2)
91+
capybara (3.38.0)
9292
addressable
9393
matrix
9494
mini_mime (>= 0.1.3)
@@ -108,7 +108,7 @@ GEM
108108
execjs
109109
coffee-script-source (1.12.2)
110110
concurrent-ruby (1.2.2)
111-
connection_pool (2.4.1)
111+
connection_pool (2.4.0)
112112
crass (1.0.6)
113113
date (3.3.3)
114114
docile (1.1.5)
@@ -135,7 +135,7 @@ GEM
135135
guard-minitest (2.4.6)
136136
guard-compat (~> 1.2)
137137
minitest (>= 3.0)
138-
i18n (1.14.1)
138+
i18n (1.13.0)
139139
concurrent-ruby (~> 1.0)
140140
jbuilder (2.11.5)
141141
actionview (>= 5.0.0)
@@ -144,10 +144,10 @@ GEM
144144
listen (3.0.8)
145145
rb-fsevent (~> 0.9, >= 0.9.4)
146146
rb-inotify (~> 0.9, >= 0.9.7)
147-
loofah (2.21.3)
147+
loofah (2.21.1)
148148
crass (~> 1.0.2)
149-
nokogiri (>= 1.12.0)
150-
lumberjack (1.2.9)
149+
nokogiri (>= 1.5.9)
150+
lumberjack (1.2.8)
151151
mail (2.8.1)
152152
mini_mime (>= 0.1.1)
153153
net-imap
@@ -156,10 +156,10 @@ GEM
156156
marcel (1.0.2)
157157
matrix (0.4.2)
158158
method_source (1.0.0)
159-
mini_mime (1.1.5)
160-
minitest (5.19.0)
159+
mini_mime (1.1.2)
160+
minitest (5.18.0)
161161
nenv (0.3.0)
162-
net-imap (0.3.7)
162+
net-imap (0.3.4)
163163
date
164164
net-protocol
165165
net-pop (0.1.2)
@@ -169,9 +169,7 @@ GEM
169169
net-smtp (0.3.3)
170170
net-protocol
171171
nio4r (2.5.9)
172-
nokogiri (1.15.4-x86_64-darwin)
173-
racc (~> 1.4)
174-
nokogiri (1.15.4-x86_64-linux)
172+
nokogiri (1.13.8-x86_64-linux)
175173
racc (~> 1.4)
176174
notiffany (0.1.3)
177175
nenv (~> 0.1)
@@ -182,35 +180,33 @@ GEM
182180
pry-byebug (3.10.1)
183181
byebug (~> 11.0)
184182
pry (>= 0.13, < 0.15)
185-
public_suffix (5.0.3)
186-
racc (1.7.1)
187-
rack (2.2.8)
183+
public_suffix (5.0.1)
184+
racc (1.6.2)
185+
rack (2.2.7)
188186
rack-test (2.1.0)
189187
rack (>= 1.3)
190-
rails (7.0.7)
191-
actioncable (= 7.0.7)
192-
actionmailbox (= 7.0.7)
193-
actionmailer (= 7.0.7)
194-
actionpack (= 7.0.7)
195-
actiontext (= 7.0.7)
196-
actionview (= 7.0.7)
197-
activejob (= 7.0.7)
198-
activemodel (= 7.0.7)
199-
activerecord (= 7.0.7)
200-
activestorage (= 7.0.7)
201-
activesupport (= 7.0.7)
188+
rails (7.0.4.3)
189+
actioncable (= 7.0.4.3)
190+
actionmailbox (= 7.0.4.3)
191+
actionmailer (= 7.0.4.3)
192+
actionpack (= 7.0.4.3)
193+
actiontext (= 7.0.4.3)
194+
actionview (= 7.0.4.3)
195+
activejob (= 7.0.4.3)
196+
activemodel (= 7.0.4.3)
197+
activerecord (= 7.0.4.3)
198+
activestorage (= 7.0.4.3)
199+
activesupport (= 7.0.4.3)
202200
bundler (>= 1.15.0)
203-
railties (= 7.0.7)
204-
rails-dom-testing (2.2.0)
205-
activesupport (>= 5.0.0)
206-
minitest
201+
railties (= 7.0.4.3)
202+
rails-dom-testing (2.0.3)
203+
activesupport (>= 4.2.0)
207204
nokogiri (>= 1.6)
208-
rails-html-sanitizer (1.6.0)
209-
loofah (~> 2.21)
210-
nokogiri (~> 1.14)
211-
railties (7.0.7)
212-
actionpack (= 7.0.7)
213-
activesupport (= 7.0.7)
205+
rails-html-sanitizer (1.5.0)
206+
loofah (~> 2.19, >= 2.19.1)
207+
railties (7.0.4.3)
208+
actionpack (= 7.0.4.3)
209+
activesupport (= 7.0.4.3)
214210
method_source
215211
rake (>= 12.2)
216212
thor (~> 1.0)
@@ -219,10 +215,10 @@ GEM
219215
rb-fsevent (0.11.2)
220216
rb-inotify (0.10.1)
221217
ffi (~> 1.0)
222-
regexp_parser (2.8.1)
223-
rexml (3.2.6)
218+
regexp_parser (2.7.0)
219+
rexml (3.2.5)
224220
rubyzip (2.3.2)
225-
selenium-webdriver (4.11.0)
221+
selenium-webdriver (4.8.3)
226222
rexml (~> 3.2, >= 3.2.5)
227223
rubyzip (>= 1.2.2, < 3.0)
228224
websocket (~> 1.0)
@@ -233,18 +229,18 @@ GEM
233229
simplecov-html (~> 0.10.0)
234230
simplecov-html (0.10.2)
235231
test-unit (2.5.5)
236-
thor (1.2.2)
237-
tilt (2.2.0)
238-
timeout (0.4.0)
232+
thor (1.2.1)
233+
tilt (2.1.0)
234+
timeout (0.3.2)
239235
tzinfo (2.0.6)
240236
concurrent-ruby (~> 1.0)
241237
websocket (1.2.9)
242-
websocket-driver (0.7.6)
238+
websocket-driver (0.7.5)
243239
websocket-extensions (>= 0.1.0)
244240
websocket-extensions (0.1.5)
245241
xpath (3.2.0)
246242
nokogiri (~> 1.8)
247-
zeitwerk (2.6.11)
243+
zeitwerk (2.6.7)
248244

249245
PLATFORMS
250246
x86_64-darwin-20

0 commit comments

Comments
 (0)