Skip to content

Commit d5c3c56

Browse files
authored
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/
1 parent 6032177 commit d5c3c56

11 files changed

+15
-11
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby: [3.2, 3.3]
16+
ruby: [3.2, 3.3, 3.4]
1717
env:
1818
PGHOST: localhost
1919
PGUSER: administrate
@@ -64,7 +64,7 @@ jobs:
6464
strategy:
6565
fail-fast: false
6666
matrix:
67-
ruby: [3.1, 3.2, 3.3]
67+
ruby: [3.1, 3.2, 3.3, 3.4]
6868
appraisal: [rails61, rails70, rails80, pundit21]
6969
include:
7070
- ruby: '3.0'

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.4.1

.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ruby 3.2.2
1+
ruby 3.4.1
22
nodejs 20.11.0
33
yarn 1.22.22

Appraisals

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ appraise "rails60" do
44
end
55

66
appraise "rails61" do
7+
gem "drb"
8+
gem "mutex_m"
79
gem "rails", "~> 6.1"
810
end
911

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source "https://rubygems.org"
2-
ruby "3.2.2" unless ENV["CI"] && !ENV["DIFF_CHECK_APPRAISAL"]
2+
ruby "3.4.1" unless ENV["CI"] && !ENV["DIFF_CHECK_APPRAISAL"]
33

44
gemspec
55

Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ DEPENDENCIES
429429
yard
430430

431431
RUBY VERSION
432-
ruby 3.2.2p53
432+
ruby 3.4.1p0
433433

434434
BUNDLED WITH
435435
2.4.22

gemfiles/pundit21.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
ruby "3.2.2"
5+
ruby "3.4.1"
66

77
gem "administrate-field-image"
88
gem "faker"

gemfiles/rails60.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
ruby "3.2.2"
5+
ruby "3.4.1"
66

77
gem "administrate-field-image"
88
gem "faker"

gemfiles/rails61.gemfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
ruby "3.2.2"
5+
ruby "3.4.1"
66

77
gem "administrate-field-image"
88
gem "faker"
@@ -19,6 +19,8 @@ gem "unicorn"
1919
gem "cssbundling-rails", "~> 1.4"
2020
gem "jsbundling-rails", "~> 1.3"
2121
gem "sprockets-rails", "~> 3.5"
22+
gem "drb"
23+
gem "mutex_m"
2224
gem "rails", "~> 6.1"
2325

2426
group :development, :test do

gemfiles/rails70.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
ruby "3.2.2"
5+
ruby "3.4.1"
66

77
gem "administrate-field-image"
88
gem "faker"

gemfiles/rails80.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
ruby "3.2.2"
5+
ruby "3.4.1"
66

77
gem "administrate-field-image"
88
gem "faker"

0 commit comments

Comments
 (0)