From c45389a4b51d75700e3502ea8e22e62adf28f8cd Mon Sep 17 00:00:00 2001
From: Vincent Prigent <vincent.prigent1@gmail.com>
Date: Tue, 21 Jan 2025 07:26:42 +1300
Subject: [PATCH] Ruby 3.4 (#359)

* Add Ruby 3.4 to CI matrix

* Drop 3.4 from rails 7.1 matrix
---
 .github/workflows/build.yml     |  7 +++++++
 Changelog.md                    |  1 +
 gemfiles/rails_7.2.gemfile.lock | 21 ++++++++-------------
 gemfiles/rails_8.0.gemfile.lock | 20 ++++++++++----------
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 51f7e71..29bfb9d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,6 +14,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '3.3'
+          - '3.4'
         gemfile:
           - gemfiles/rails_6.1.gemfile
           - gemfiles/rails_7.0.gemfile
@@ -23,6 +24,12 @@ jobs:
         exclude:
           - ruby: '3.1'
             gemfile: 'gemfiles/rails_8.0.gemfile'
+          - ruby: '3.4'
+            gemfile: 'gemfiles/rails_6.1.gemfile'
+          - ruby: '3.4'
+            gemfile: 'gemfiles/rails_7.0.gemfile'
+          - ruby: '3.4'
+            gemfile: 'gemfiles/rails_7.1.gemfile'
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
diff --git a/Changelog.md b/Changelog.md
index 3f511b6..bcce447 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 # Unreleased
 - Use lease_connection over deprecated connection for rails 8 https://github.com/ilyakatz/data-migrate/pull/353
+- Add Ruby 3.4 to CI matrix
 
 # 11.2.0
 - Remove committed Gemfile.lock, reduce bundled file list when running `gem install` https://github.com/ilyakatz/data-migrate/pull/351
diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock
index e10239c..fe66575 100644
--- a/gemfiles/rails_7.2.gemfile.lock
+++ b/gemfiles/rails_7.2.gemfile.lock
@@ -118,7 +118,6 @@ GEM
     marcel (1.0.4)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
     minitest (5.25.1)
     net-imap (0.4.14)
       date
@@ -130,16 +129,13 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.0-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.18.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.18.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.0-x86_64-linux-gnu)
       racc (~> 1.4)
     overcommit (0.63.0)
       childprocess (>= 0.6.3, < 6)
@@ -230,10 +226,10 @@ GEM
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     securerandom (0.3.1)
-    sqlite3 (2.0.2-aarch64-linux-gnu)
-    sqlite3 (2.0.2-arm64-darwin)
-    sqlite3 (2.0.2-x86_64-darwin)
-    sqlite3 (2.0.2-x86_64-linux-gnu)
+    sqlite3 (2.5.0-aarch64-linux-gnu)
+    sqlite3 (2.5.0-arm64-darwin)
+    sqlite3 (2.5.0-x86_64-darwin)
+    sqlite3 (2.5.0-x86_64-linux-gnu)
     stringio (3.1.1)
     strscan (3.1.0)
     thor (1.3.1)
@@ -252,7 +248,6 @@ GEM
 PLATFORMS
   aarch64-linux
   arm64-darwin-23
-  ruby
   x86_64-darwin-22
   x86_64-linux
 
diff --git a/gemfiles/rails_8.0.gemfile.lock b/gemfiles/rails_8.0.gemfile.lock
index 359d414..7153952 100644
--- a/gemfiles/rails_8.0.gemfile.lock
+++ b/gemfiles/rails_8.0.gemfile.lock
@@ -133,16 +133,16 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.16.7)
+    nokogiri (1.18.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.18.0-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.18.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.18.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.0-x86_64-linux-gnu)
       racc (~> 1.4)
     overcommit (0.64.0)
       childprocess (>= 0.6.3, < 6)
@@ -231,12 +231,12 @@ GEM
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     securerandom (0.3.1)
-    sqlite3 (2.1.0)
+    sqlite3 (2.5.0)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (2.1.0-aarch64-linux-gnu)
-    sqlite3 (2.1.0-arm64-darwin)
-    sqlite3 (2.1.0-x86_64-darwin)
-    sqlite3 (2.1.0-x86_64-linux-gnu)
+    sqlite3 (2.5.0-aarch64-linux-gnu)
+    sqlite3 (2.5.0-arm64-darwin)
+    sqlite3 (2.5.0-x86_64-darwin)
+    sqlite3 (2.5.0-x86_64-linux-gnu)
     stringio (3.1.1)
     thor (1.3.2)
     timecop (0.9.10)