Skip to content

Commit 0ac0105

Browse files
Merge pull request #1771 from sanger/rails-8.1-upgrade
Rails 8.1 upgrade
2 parents b9a069b + 70ab8ae commit 0ac0105

4 files changed

Lines changed: 105 additions & 78 deletions

File tree

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ gem 'mysql2'
1414
gem 'puma' # Use Puma as the app server
1515
gem 'rack-cors' # Use Rack CORS for handling CORS, making cross-origin AJAX possible
1616
gem 'rack-session' # Use Rack Session for session management. Needed for flipper
17-
gem 'rails', '~> 8.0.2'
18-
gem 'sanger-jsonapi-resources', '~> 0.2.1'
17+
gem 'rails', '~> 8.1.2'
18+
gem 'sanger-jsonapi-resources', '~> 0.3.0'
1919
gem 'syslog' # No longer part of the default gems in Ruby 3.4
2020

2121
group :development do

Gemfile.lock

Lines changed: 80 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,75 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (8.0.3)
5-
actionpack (= 8.0.3)
6-
activesupport (= 8.0.3)
4+
action_text-trix (2.1.16)
5+
railties
6+
actioncable (8.1.2)
7+
actionpack (= 8.1.2)
8+
activesupport (= 8.1.2)
79
nio4r (~> 2.0)
810
websocket-driver (>= 0.6.1)
911
zeitwerk (~> 2.6)
10-
actionmailbox (8.0.3)
11-
actionpack (= 8.0.3)
12-
activejob (= 8.0.3)
13-
activerecord (= 8.0.3)
14-
activestorage (= 8.0.3)
15-
activesupport (= 8.0.3)
12+
actionmailbox (8.1.2)
13+
actionpack (= 8.1.2)
14+
activejob (= 8.1.2)
15+
activerecord (= 8.1.2)
16+
activestorage (= 8.1.2)
17+
activesupport (= 8.1.2)
1618
mail (>= 2.8.0)
17-
actionmailer (8.0.3)
18-
actionpack (= 8.0.3)
19-
actionview (= 8.0.3)
20-
activejob (= 8.0.3)
21-
activesupport (= 8.0.3)
19+
actionmailer (8.1.2)
20+
actionpack (= 8.1.2)
21+
actionview (= 8.1.2)
22+
activejob (= 8.1.2)
23+
activesupport (= 8.1.2)
2224
mail (>= 2.8.0)
2325
rails-dom-testing (~> 2.2)
24-
actionpack (8.0.3)
25-
actionview (= 8.0.3)
26-
activesupport (= 8.0.3)
26+
actionpack (8.1.2)
27+
actionview (= 8.1.2)
28+
activesupport (= 8.1.2)
2729
nokogiri (>= 1.8.5)
2830
rack (>= 2.2.4)
2931
rack-session (>= 1.0.1)
3032
rack-test (>= 0.6.3)
3133
rails-dom-testing (~> 2.2)
3234
rails-html-sanitizer (~> 1.6)
3335
useragent (~> 0.16)
34-
actiontext (8.0.3)
35-
actionpack (= 8.0.3)
36-
activerecord (= 8.0.3)
37-
activestorage (= 8.0.3)
38-
activesupport (= 8.0.3)
36+
actiontext (8.1.2)
37+
action_text-trix (~> 2.1.15)
38+
actionpack (= 8.1.2)
39+
activerecord (= 8.1.2)
40+
activestorage (= 8.1.2)
41+
activesupport (= 8.1.2)
3942
globalid (>= 0.6.0)
4043
nokogiri (>= 1.8.5)
41-
actionview (8.0.3)
42-
activesupport (= 8.0.3)
44+
actionview (8.1.2)
45+
activesupport (= 8.1.2)
4346
builder (~> 3.1)
4447
erubi (~> 1.11)
4548
rails-dom-testing (~> 2.2)
4649
rails-html-sanitizer (~> 1.6)
47-
activejob (8.0.3)
48-
activesupport (= 8.0.3)
50+
activejob (8.1.2)
51+
activesupport (= 8.1.2)
4952
globalid (>= 0.3.6)
50-
activemodel (8.0.3)
51-
activesupport (= 8.0.3)
52-
activerecord (8.0.3)
53-
activemodel (= 8.0.3)
54-
activesupport (= 8.0.3)
53+
activemodel (8.1.2)
54+
activesupport (= 8.1.2)
55+
activerecord (8.1.2)
56+
activemodel (= 8.1.2)
57+
activesupport (= 8.1.2)
5558
timeout (>= 0.4.0)
56-
activestorage (8.0.3)
57-
actionpack (= 8.0.3)
58-
activejob (= 8.0.3)
59-
activerecord (= 8.0.3)
60-
activesupport (= 8.0.3)
59+
activestorage (8.1.2)
60+
actionpack (= 8.1.2)
61+
activejob (= 8.1.2)
62+
activerecord (= 8.1.2)
63+
activesupport (= 8.1.2)
6164
marcel (~> 1.0)
62-
activesupport (8.0.3)
65+
activesupport (8.1.2)
6366
base64
64-
benchmark (>= 0.3)
6567
bigdecimal
6668
concurrent-ruby (~> 1.0, >= 1.3.1)
6769
connection_pool (>= 2.2.5)
6870
drb
6971
i18n (>= 1.6, < 2)
72+
json
7073
logger (>= 1.4.2)
7174
minitest (>= 5.1)
7275
securerandom (>= 0.3)
@@ -79,7 +82,6 @@ GEM
7982
avro (1.12.1)
8083
multi_json (~> 1.0)
8184
base64 (0.3.0)
82-
benchmark (0.5.0)
8385
bigdecimal (4.0.1)
8486
bootsnap (1.21.1)
8587
msgpack (~> 1.2)
@@ -104,10 +106,10 @@ GEM
104106
activerecord (>= 5.a)
105107
database_cleaner-core (~> 2.0.0)
106108
database_cleaner-core (2.0.1)
107-
date (3.4.1)
109+
date (3.5.1)
108110
diff-lcs (1.6.2)
109111
drb (2.2.3)
110-
erb (5.0.2)
112+
erb (6.0.1)
111113
erubi (1.13.1)
112114
exception_notification (5.0.1)
113115
actionmailer (>= 7.1, < 9)
@@ -138,8 +140,8 @@ GEM
138140
hashdiff (1.2.1)
139141
i18n (1.14.8)
140142
concurrent-ruby (~> 1.0)
141-
io-console (0.8.1)
142-
irb (1.15.2)
143+
io-console (0.8.2)
144+
irb (1.16.0)
143145
pp (>= 0.6.0)
144146
rdoc (>= 4.0.0)
145147
reline (>= 0.4.2)
@@ -151,10 +153,11 @@ GEM
151153
rb-fsevent (~> 0.10, >= 0.10.3)
152154
rb-inotify (~> 0.9, >= 0.9.10)
153155
logger (1.7.0)
154-
loofah (2.24.1)
156+
loofah (2.25.0)
155157
crass (~> 1.0.2)
156158
nokogiri (>= 1.12.0)
157-
mail (2.8.1)
159+
mail (2.9.0)
160+
logger
158161
mini_mime (>= 0.1.1)
159162
net-imap
160163
net-pop
@@ -169,7 +172,7 @@ GEM
169172
multi_json (1.17.0)
170173
mysql2 (0.5.7)
171174
bigdecimal
172-
net-imap (0.5.10)
175+
net-imap (0.6.2)
173176
date
174177
net-protocol
175178
net-pop (0.1.2)
@@ -179,14 +182,14 @@ GEM
179182
net-smtp (0.5.1)
180183
net-protocol
181184
nio4r (2.7.5)
182-
nokogiri (1.18.10)
185+
nokogiri (1.19.0)
183186
mini_portile2 (~> 2.8.2)
184187
racc (~> 1.4)
185188
parallel (1.27.0)
186189
parser (3.3.10.1)
187190
ast (~> 2.4.1)
188191
racc
189-
pp (0.6.2)
192+
pp (0.6.3)
190193
prettyprint
191194
prettyprint (0.2.0)
192195
prism (1.8.0)
@@ -195,7 +198,7 @@ GEM
195198
method_source (~> 1.0)
196199
pry-rails (0.3.11)
197200
pry (>= 0.13.0)
198-
psych (5.2.6)
201+
psych (5.3.1)
199202
date
200203
stringio
201204
public_suffix (6.0.2)
@@ -215,22 +218,22 @@ GEM
215218
rack (>= 3.0.0)
216219
rack-test (2.2.0)
217220
rack (>= 1.3)
218-
rackup (2.2.1)
221+
rackup (2.3.1)
219222
rack (>= 3)
220-
rails (8.0.3)
221-
actioncable (= 8.0.3)
222-
actionmailbox (= 8.0.3)
223-
actionmailer (= 8.0.3)
224-
actionpack (= 8.0.3)
225-
actiontext (= 8.0.3)
226-
actionview (= 8.0.3)
227-
activejob (= 8.0.3)
228-
activemodel (= 8.0.3)
229-
activerecord (= 8.0.3)
230-
activestorage (= 8.0.3)
231-
activesupport (= 8.0.3)
223+
rails (8.1.2)
224+
actioncable (= 8.1.2)
225+
actionmailbox (= 8.1.2)
226+
actionmailer (= 8.1.2)
227+
actionpack (= 8.1.2)
228+
actiontext (= 8.1.2)
229+
actionview (= 8.1.2)
230+
activejob (= 8.1.2)
231+
activemodel (= 8.1.2)
232+
activerecord (= 8.1.2)
233+
activestorage (= 8.1.2)
234+
activesupport (= 8.1.2)
232235
bundler (>= 1.15.0)
233-
railties (= 8.0.3)
236+
railties (= 8.1.2)
234237
rails-dom-testing (2.3.0)
235238
activesupport (>= 5.0.0)
236239
minitest
@@ -243,26 +246,27 @@ GEM
243246
rails-html-sanitizer (1.6.2)
244247
loofah (~> 2.21)
245248
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)
246-
railties (8.0.3)
247-
actionpack (= 8.0.3)
248-
activesupport (= 8.0.3)
249+
railties (8.1.2)
250+
actionpack (= 8.1.2)
251+
activesupport (= 8.1.2)
249252
irb (~> 1.13)
250253
rackup (>= 1.0.0)
251254
rake (>= 12.2)
252255
thor (~> 1.0, >= 1.2.2)
253256
tsort (>= 0.2)
254257
zeitwerk (~> 2.6)
255258
rainbow (3.1.1)
256-
rake (13.3.0)
259+
rake (13.3.1)
257260
rb-fsevent (0.11.2)
258261
rb-inotify (0.11.1)
259262
ffi (~> 1.0)
260263
rbtree (0.4.6)
261-
rdoc (6.14.2)
264+
rdoc (7.1.0)
262265
erb
263266
psych (>= 4.0.0)
267+
tsort
264268
regexp_parser (2.11.3)
265-
reline (0.6.2)
269+
reline (0.6.3)
266270
io-console (~> 0.5)
267271
rexml (3.4.4)
268272
rspec-core (3.13.5)
@@ -311,7 +315,7 @@ GEM
311315
ruby-graphviz (1.2.5)
312316
rexml
313317
ruby-progressbar (1.13.0)
314-
sanger-jsonapi-resources (0.2.1)
318+
sanger-jsonapi-resources (0.3.0)
315319
activerecord (>= 5.1)
316320
concurrent-ruby
317321
railties (>= 5.1)
@@ -329,11 +333,11 @@ GEM
329333
spring-watcher-listen (2.1.0)
330334
listen (>= 2.7, < 4.0)
331335
spring (>= 4)
332-
stringio (3.1.7)
336+
stringio (3.2.0)
333337
syslog (0.3.0)
334338
logger
335-
thor (1.4.0)
336-
timeout (0.4.3)
339+
thor (1.5.0)
340+
timeout (0.6.0)
337341
tsort (0.2.0)
338342
tzinfo (2.0.6)
339343
concurrent-ruby (~> 1.0)
@@ -351,7 +355,7 @@ GEM
351355
websocket-extensions (>= 0.1.0)
352356
websocket-extensions (0.1.5)
353357
yard (0.9.38)
354-
zeitwerk (2.7.3)
358+
zeitwerk (2.7.4)
355359

356360
PLATFORMS
357361
ruby
@@ -375,14 +379,14 @@ DEPENDENCIES
375379
puma
376380
rack-cors
377381
rack-session
378-
rails (~> 8.0.2)
382+
rails (~> 8.1.2)
379383
rails-erd
380384
rspec-rails
381385
rubocop
382386
rubocop-factory_bot
383387
rubocop-rails
384388
rubocop-rspec
385-
sanger-jsonapi-resources (~> 0.2.1)
389+
sanger-jsonapi-resources (~> 0.3.0)
386390
shoulda-matchers
387391
spring
388392
spring-watcher-listen

bin/ci

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env ruby
2+
require_relative "../config/boot"
3+
require "active_support/continuous_integration"
4+
5+
CI = ActiveSupport::ContinuousIntegration
6+
require_relative "../config/ci.rb"

config/ci.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# frozen_string_literal: true
2+
3+
# Run using bin/ci
4+
5+
CI.run do
6+
step 'Setup', 'bin/setup --skip-server'
7+
8+
step 'Style: Ruby', 'bin/rubocop'
9+
10+
# Optional: set a green GitHub commit status to unblock PR merge.
11+
# Requires the `gh` CLI and `gh extension install basecamp/gh-signoff`.
12+
# if success?
13+
# step "Signoff: All systems go. Ready for merge and deploy.", "gh signoff"
14+
# else
15+
# failure "Signoff: CI failed. Do not merge or deploy.", "Fix the issues and try again."
16+
# end
17+
end

0 commit comments

Comments
 (0)