Upgrade base Ruby to 3.4.1 and add to test matrix (#2734)

We also add `mutex_m` and `drb`, as Rails 6.1 fails on Ruby 3.4 without it. Those gems have been moved out of Ruby core. https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-0-released/
thoughtbot · Dec 31, 2024 · d5c3c56 · d5c3c56
1 parent 6032177
commit d5c3c56
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.2, 3.3]
+        ruby: [3.2, 3.3, 3.4]
     env:
       PGHOST: localhost
       PGUSER: administrate
@@ -64,7 +64,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.1, 3.2, 3.3]
+        ruby: [3.1, 3.2, 3.3, 3.4]
         appraisal: [rails61, rails70, rails80, pundit21]
         include:
           - ruby: '3.0'

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.4.1
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
-ruby 3.2.2
+ruby 3.4.1
 nodejs 20.11.0
 yarn 1.22.22
diff --git a/Appraisals b/Appraisals
@@ -4,6 +4,8 @@ appraise "rails60" do
 end
 
 appraise "rails61" do
+  gem "drb"
+  gem "mutex_m"
   gem "rails", "~> 6.1"
 end
 

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "3.2.2" unless ENV["CI"] && !ENV["DIFF_CHECK_APPRAISAL"]
+ruby "3.4.1" unless ENV["CI"] && !ENV["DIFF_CHECK_APPRAISAL"]
 
 gemspec
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -429,7 +429,7 @@ DEPENDENCIES
   yard
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.4.1p0
 
 BUNDLED WITH
    2.4.22
diff --git a/gemfiles/pundit21.gemfile b/gemfiles/pundit21.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "3.2.2"
+ruby "3.4.1"
 
 gem "administrate-field-image"
 gem "faker"

diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "3.2.2"
+ruby "3.4.1"
 
 gem "administrate-field-image"
 gem "faker"

diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "3.2.2"
+ruby "3.4.1"
 
 gem "administrate-field-image"
 gem "faker"
@@ -19,6 +19,8 @@ gem "unicorn"
 gem "cssbundling-rails", "~> 1.4"
 gem "jsbundling-rails", "~> 1.3"
 gem "sprockets-rails", "~> 3.5"
+gem "drb"
+gem "mutex_m"
 gem "rails", "~> 6.1"
 
 group :development, :test do

diff --git a/gemfiles/rails70.gemfile b/gemfiles/rails70.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "3.2.2"
+ruby "3.4.1"
 
 gem "administrate-field-image"
 gem "faker"

diff --git a/gemfiles/rails80.gemfile b/gemfiles/rails80.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "3.2.2"
+ruby "3.4.1"
 
 gem "administrate-field-image"
 gem "faker"