Fix CI against Ruby 3.4 (#176)

Shopify · Feb 6, 2025 · 37f2922 · 37f2922
1 parent 0307198
commit 37f2922
Show file tree

Hide file tree

Showing 14 changed files with 146 additions and 90 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,17 +15,19 @@ jobs:
       fail-fast: false
       max-parallel: 8
       matrix:
-        activerecord: ["6.1", "7.0", "7.1", "head"]
+        activerecord: ["6.1", "7.2", "8.0", "head"]
         ruby: ["3.1", "3.2", "3.3", "head"]
         mysql: ["5.7", "8.0"]
         adapter: ["mysql2", "trilogy"]
         exclude:
           - activerecord: 6.1
             ruby: head
-          - activerecord: 7.0
+          - activerecord: 7.2
             ruby: head
+          - activerecord: 8.0
+            ruby: 3.1
           - activerecord: head
-            ruby: 3.0
+            ruby: 3.1
 
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord_${{ matrix.activerecord }}.gemfile"

diff --git a/Appraisals b/Appraisals
@@ -3,13 +3,12 @@ appraise "activerecord-6.1" do
   gem "activerecord-trilogy-adapter"
 end
 
-appraise "activerecord-7.0" do
-  gem "activerecord", "7.0.8"
-  gem "activerecord-trilogy-adapter"
+appraise "activerecord-7.2" do
+  gem "activerecord", "7.2.2.1"
 end
 
-appraise "activerecord-7.1" do
-  gem "activerecord", "7.1.1"
+appraise "activerecord-8.0" do
+  gem "activerecord", "8.0.1"
 end
 
 appraise "activerecord-head" do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,14 +7,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.2.0)
-      activesupport (= 7.2.0)
-    activerecord (7.2.0)
-      activemodel (= 7.2.0)
-      activesupport (= 7.2.0)
+    activemodel (8.0.1)
+      activesupport (= 8.0.1)
+    activerecord (8.0.1)
+      activemodel (= 8.0.1)
+      activesupport (= 8.0.1)
       timeout (>= 0.4.0)
-    activesupport (7.2.0)
+    activesupport (8.0.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -24,45 +25,50 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     after_do (0.4.0)
     appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     byebug (11.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     docile (1.4.1)
     drb (2.2.1)
-    i18n (1.14.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    logger (1.6.0)
-    minitest (5.25.1)
+    logger (1.6.5)
+    minitest (5.25.4)
     mocha (2.4.5)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.6)
+    ostruct (0.6.1)
     rake (13.2.1)
     retriable (3.1.2)
     ruby2_keywords (0.0.5)
-    securerandom (0.3.1)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    thor (1.3.1)
-    timeout (0.4.1)
+    thor (1.3.2)
+    timeout (0.4.3)
     toxiproxy (2.0.2)
     trilogy (2.8.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.0.2)
 
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-linux
 
@@ -72,13 +78,15 @@ DEPENDENCIES
   appraisal
   byebug
   lhm-shopify!
+  logger
   minitest
   mocha
   mysql2
+  ostruct
   rake
   simplecov
   toxiproxy
   trilogy
 
 BUNDLED WITH
-   2.2.22
+   2.6.3
diff --git a/gemfiles/activerecord_6.1.gemfile.lock b/gemfiles/activerecord_6.1.gemfile.lock
@@ -31,10 +31,12 @@ GEM
     docile (1.4.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    logger (1.6.1)
     minitest (5.22.2)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.5)
+    ostruct (0.6.1)
     rake (13.0.6)
     retriable (3.1.2)
     ruby2_keywords (0.0.5)
@@ -44,7 +46,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    thor (1.2.2)
+    thor (1.3.2)
     toxiproxy (2.0.2)
     trilogy (2.6.0)
     tzinfo (2.0.6)
@@ -64,9 +66,11 @@ DEPENDENCIES
   appraisal
   byebug
   lhm-shopify!
+  logger
   minitest
   mocha
   mysql2
+  ostruct
   rake
   simplecov
   toxiproxy

diff --git a/gemfiles/activerecord_7.0.gemfile → gemfiles/activerecord_7.2.gemfile b/gemfiles/activerecord_7.0.gemfile → gemfiles/activerecord_7.2.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "7.0.8"
-gem "activerecord-trilogy-adapter"
+gem "activerecord", "7.2.2.1"
 
 gemspec path: "../"
diff --git a/gemfiles/activerecord_7.0.gemfile.lock → gemfiles/activerecord_7.2.gemfile.lock b/gemfiles/activerecord_7.0.gemfile.lock → gemfiles/activerecord_7.2.gemfile.lock
@@ -7,68 +7,84 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activerecord-trilogy-adapter (3.1.2)
-      activerecord (>= 6.0.a, < 7.1.a)
-      trilogy (>= 2.4.0)
-    activesupport (7.0.8)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (7.2.2.1)
+      activesupport (= 7.2.2.1)
+    activerecord (7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
+      timeout (>= 0.4.0)
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     after_do (0.4.0)
     appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     byebug (11.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     docile (1.4.0)
-    i18n (1.14.1)
+    drb (2.2.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.22.2)
+    logger (1.6.5)
+    minitest (5.25.4)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.5)
+    ostruct (0.6.1)
     rake (13.0.6)
     retriable (3.1.2)
     ruby2_keywords (0.0.5)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    thor (1.2.2)
+    thor (1.3.2)
+    timeout (0.4.3)
     toxiproxy (2.0.2)
-    trilogy (2.6.0)
+    trilogy (2.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
-  activerecord (= 7.0.8)
-  activerecord-trilogy-adapter
+  activerecord (= 7.2.2.1)
   after_do
   appraisal
   byebug
   lhm-shopify!
+  logger
   minitest
   mocha
   mysql2
+  ostruct
   rake
   simplecov
   toxiproxy
   trilogy
 
 BUNDLED WITH
-   2.2.22
+   2.6.3
diff --git a/gemfiles/activerecord_7.1.gemfile → gemfiles/activerecord_8.0.gemfile b/gemfiles/activerecord_7.1.gemfile → gemfiles/activerecord_8.0.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "7.1.1"
+gem "activerecord", "8.0.1"
 
 gemspec path: "../"