Skip to content

Commit 37f2922

Browse files
authored
Fix CI against Ruby 3.4 (#176)
1 parent 0307198 commit 37f2922

14 files changed

+146
-90
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@ jobs:
1515
fail-fast: false
1616
max-parallel: 8
1717
matrix:
18-
activerecord: ["6.1", "7.0", "7.1", "head"]
18+
activerecord: ["6.1", "7.2", "8.0", "head"]
1919
ruby: ["3.1", "3.2", "3.3", "head"]
2020
mysql: ["5.7", "8.0"]
2121
adapter: ["mysql2", "trilogy"]
2222
exclude:
2323
- activerecord: 6.1
2424
ruby: head
25-
- activerecord: 7.0
25+
- activerecord: 7.2
2626
ruby: head
27+
- activerecord: 8.0
28+
ruby: 3.1
2729
- activerecord: head
28-
ruby: 3.0
30+
ruby: 3.1
2931

3032
env:
3133
BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord_${{ matrix.activerecord }}.gemfile"

Appraisals

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ appraise "activerecord-6.1" do
33
gem "activerecord-trilogy-adapter"
44
end
55

6-
appraise "activerecord-7.0" do
7-
gem "activerecord", "7.0.8"
8-
gem "activerecord-trilogy-adapter"
6+
appraise "activerecord-7.2" do
7+
gem "activerecord", "7.2.2.1"
98
end
109

11-
appraise "activerecord-7.1" do
12-
gem "activerecord", "7.1.1"
10+
appraise "activerecord-8.0" do
11+
gem "activerecord", "8.0.1"
1312
end
1413

1514
appraise "activerecord-head" do

Gemfile.lock

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (7.2.0)
11-
activesupport (= 7.2.0)
12-
activerecord (7.2.0)
13-
activemodel (= 7.2.0)
14-
activesupport (= 7.2.0)
10+
activemodel (8.0.1)
11+
activesupport (= 8.0.1)
12+
activerecord (8.0.1)
13+
activemodel (= 8.0.1)
14+
activesupport (= 8.0.1)
1515
timeout (>= 0.4.0)
16-
activesupport (7.2.0)
16+
activesupport (8.0.1)
1717
base64
18+
benchmark (>= 0.3)
1819
bigdecimal
1920
concurrent-ruby (~> 1.0, >= 1.3.1)
2021
connection_pool (>= 2.2.5)
@@ -24,45 +25,50 @@ GEM
2425
minitest (>= 5.1)
2526
securerandom (>= 0.3)
2627
tzinfo (~> 2.0, >= 2.0.5)
28+
uri (>= 0.13.1)
2729
after_do (0.4.0)
2830
appraisal (2.5.0)
2931
bundler
3032
rake
3133
thor (>= 0.14.0)
3234
base64 (0.2.0)
33-
bigdecimal (3.1.8)
35+
benchmark (0.4.0)
36+
bigdecimal (3.1.9)
3437
byebug (11.1.3)
35-
concurrent-ruby (1.3.4)
36-
connection_pool (2.4.1)
38+
concurrent-ruby (1.3.5)
39+
connection_pool (2.5.0)
3740
docile (1.4.1)
3841
drb (2.2.1)
39-
i18n (1.14.5)
42+
i18n (1.14.7)
4043
concurrent-ruby (~> 1.0)
41-
logger (1.6.0)
42-
minitest (5.25.1)
44+
logger (1.6.5)
45+
minitest (5.25.4)
4346
mocha (2.4.5)
4447
ruby2_keywords (>= 0.0.5)
4548
mysql2 (0.5.6)
49+
ostruct (0.6.1)
4650
rake (13.2.1)
4751
retriable (3.1.2)
4852
ruby2_keywords (0.0.5)
49-
securerandom (0.3.1)
53+
securerandom (0.4.1)
5054
simplecov (0.22.0)
5155
docile (~> 1.1)
5256
simplecov-html (~> 0.11)
5357
simplecov_json_formatter (~> 0.1)
5458
simplecov-html (0.12.3)
5559
simplecov_json_formatter (0.1.4)
56-
thor (1.3.1)
57-
timeout (0.4.1)
60+
thor (1.3.2)
61+
timeout (0.4.3)
5862
toxiproxy (2.0.2)
5963
trilogy (2.8.1)
6064
tzinfo (2.0.6)
6165
concurrent-ruby (~> 1.0)
66+
uri (1.0.2)
6267

6368
PLATFORMS
6469
arm64-darwin-21
6570
arm64-darwin-22
71+
arm64-darwin-23
6672
x86_64-darwin-20
6773
x86_64-linux
6874

@@ -72,13 +78,15 @@ DEPENDENCIES
7278
appraisal
7379
byebug
7480
lhm-shopify!
81+
logger
7582
minitest
7683
mocha
7784
mysql2
85+
ostruct
7886
rake
7987
simplecov
8088
toxiproxy
8189
trilogy
8290

8391
BUNDLED WITH
84-
2.2.22
92+
2.6.3

gemfiles/activerecord_6.1.gemfile.lock

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ GEM
3131
docile (1.4.0)
3232
i18n (1.14.1)
3333
concurrent-ruby (~> 1.0)
34+
logger (1.6.1)
3435
minitest (5.22.2)
3536
mocha (2.1.0)
3637
ruby2_keywords (>= 0.0.5)
3738
mysql2 (0.5.5)
39+
ostruct (0.6.1)
3840
rake (13.0.6)
3941
retriable (3.1.2)
4042
ruby2_keywords (0.0.5)
@@ -44,7 +46,7 @@ GEM
4446
simplecov_json_formatter (~> 0.1)
4547
simplecov-html (0.12.3)
4648
simplecov_json_formatter (0.1.4)
47-
thor (1.2.2)
49+
thor (1.3.2)
4850
toxiproxy (2.0.2)
4951
trilogy (2.6.0)
5052
tzinfo (2.0.6)
@@ -64,9 +66,11 @@ DEPENDENCIES
6466
appraisal
6567
byebug
6668
lhm-shopify!
69+
logger
6770
minitest
6871
mocha
6972
mysql2
73+
ostruct
7074
rake
7175
simplecov
7276
toxiproxy

gemfiles/activerecord_7.0.gemfile renamed to gemfiles/activerecord_7.2.gemfile

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

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

5-
gem "activerecord", "7.0.8"
6-
gem "activerecord-trilogy-adapter"
5+
gem "activerecord", "7.2.2.1"
76

87
gemspec path: "../"

gemfiles/activerecord_7.0.gemfile.lock renamed to gemfiles/activerecord_7.2.gemfile.lock

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,68 +7,84 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (7.0.8)
11-
activesupport (= 7.0.8)
12-
activerecord (7.0.8)
13-
activemodel (= 7.0.8)
14-
activesupport (= 7.0.8)
15-
activerecord-trilogy-adapter (3.1.2)
16-
activerecord (>= 6.0.a, < 7.1.a)
17-
trilogy (>= 2.4.0)
18-
activesupport (7.0.8)
19-
concurrent-ruby (~> 1.0, >= 1.0.2)
10+
activemodel (7.2.2.1)
11+
activesupport (= 7.2.2.1)
12+
activerecord (7.2.2.1)
13+
activemodel (= 7.2.2.1)
14+
activesupport (= 7.2.2.1)
15+
timeout (>= 0.4.0)
16+
activesupport (7.2.2.1)
17+
base64
18+
benchmark (>= 0.3)
19+
bigdecimal
20+
concurrent-ruby (~> 1.0, >= 1.3.1)
21+
connection_pool (>= 2.2.5)
22+
drb
2023
i18n (>= 1.6, < 2)
24+
logger (>= 1.4.2)
2125
minitest (>= 5.1)
22-
tzinfo (~> 2.0)
26+
securerandom (>= 0.3)
27+
tzinfo (~> 2.0, >= 2.0.5)
2328
after_do (0.4.0)
2429
appraisal (2.5.0)
2530
bundler
2631
rake
2732
thor (>= 0.14.0)
33+
base64 (0.2.0)
34+
benchmark (0.4.0)
35+
bigdecimal (3.1.9)
2836
byebug (11.1.3)
29-
concurrent-ruby (1.2.2)
37+
concurrent-ruby (1.3.5)
38+
connection_pool (2.5.0)
3039
docile (1.4.0)
31-
i18n (1.14.1)
40+
drb (2.2.1)
41+
i18n (1.14.7)
3242
concurrent-ruby (~> 1.0)
33-
minitest (5.22.2)
43+
logger (1.6.5)
44+
minitest (5.25.4)
3445
mocha (2.1.0)
3546
ruby2_keywords (>= 0.0.5)
3647
mysql2 (0.5.5)
48+
ostruct (0.6.1)
3749
rake (13.0.6)
3850
retriable (3.1.2)
3951
ruby2_keywords (0.0.5)
52+
securerandom (0.4.1)
4053
simplecov (0.22.0)
4154
docile (~> 1.1)
4255
simplecov-html (~> 0.11)
4356
simplecov_json_formatter (~> 0.1)
4457
simplecov-html (0.12.3)
4558
simplecov_json_formatter (0.1.4)
46-
thor (1.2.2)
59+
thor (1.3.2)
60+
timeout (0.4.3)
4761
toxiproxy (2.0.2)
48-
trilogy (2.6.0)
62+
trilogy (2.9.0)
4963
tzinfo (2.0.6)
5064
concurrent-ruby (~> 1.0)
5165

5266
PLATFORMS
5367
arm64-darwin-21
5468
arm64-darwin-22
69+
arm64-darwin-23
5570
x86_64-darwin-20
5671
x86_64-linux
5772

5873
DEPENDENCIES
59-
activerecord (= 7.0.8)
60-
activerecord-trilogy-adapter
74+
activerecord (= 7.2.2.1)
6175
after_do
6276
appraisal
6377
byebug
6478
lhm-shopify!
79+
logger
6580
minitest
6681
mocha
6782
mysql2
83+
ostruct
6884
rake
6985
simplecov
7086
toxiproxy
7187
trilogy
7288

7389
BUNDLED WITH
74-
2.2.22
90+
2.6.3

gemfiles/activerecord_7.1.gemfile renamed to gemfiles/activerecord_8.0.gemfile

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

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

5-
gem "activerecord", "7.1.1"
5+
gem "activerecord", "8.0.1"
66

77
gemspec path: "../"

0 commit comments

Comments
 (0)