Support Ruby 3.4 and rails7.2

naitoh · naitoh · commit 728872fd70d0 · 2025-05-05T15:19:45.000+09:00
- Add ImageMagick installation for ubuntu-latest (ubuntu 24)
- Fixed mini_magick support up to 4.x
- Fixed rmagick support up to 5.x
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['jruby', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
+        ruby: ['jruby', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
         gemfile: ['Gemfile.rbpdf-font']
         include:
           - { ruby: 'jruby', gemfile: 'Gemfile.rails7' }
@@ -25,12 +25,12 @@ jobs:
           - { ruby: '2.6', gemfile: 'Gemfile.rails6' }
           - { ruby: '2.6', gemfile: 'Gemfile.rails6_rmagick' }
           - { ruby: '2.6', gemfile: 'Gemfile.rails6_mini_magick' }
-          - { ruby: '2.7', gemfile: 'Gemfile.rails7' }
-          - { ruby: '2.7', gemfile: 'Gemfile.rails7_rmagick' }
-          - { ruby: '2.7', gemfile: 'Gemfile.rails7_mini_magick' }
-          - { ruby: '3.0', gemfile: 'Gemfile.rails7' }
-          - { ruby: '3.0', gemfile: 'Gemfile.rails7_rmagick' }
-          - { ruby: '3.0', gemfile: 'Gemfile.rails7_mini_magick' }
+          - { ruby: '2.7', gemfile: 'Gemfile.rails6' }
+          - { ruby: '2.7', gemfile: 'Gemfile.rails6_rmagick' }
+          - { ruby: '2.7', gemfile: 'Gemfile.rails6_mini_magick' }
+          - { ruby: '3.0', gemfile: 'Gemfile.rails6' }
+          - { ruby: '3.0', gemfile: 'Gemfile.rails6_rmagick' }
+          - { ruby: '3.0', gemfile: 'Gemfile.rails6_mini_magick' }
           - { ruby: '3.1', gemfile: 'Gemfile.rails7' }
           - { ruby: '3.1', gemfile: 'Gemfile.rails7_rmagick' }
           - { ruby: '3.1', gemfile: 'Gemfile.rails7_mini_magick' }
@@ -40,10 +40,18 @@ jobs:
           - { ruby: '3.3', gemfile: 'Gemfile.rails7' }
           - { ruby: '3.3', gemfile: 'Gemfile.rails7_rmagick' }
           - { ruby: '3.3', gemfile: 'Gemfile.rails7_mini_magick' }
+          - { ruby: '3.4', gemfile: 'Gemfile.rails7' }
+          - { ruby: '3.4', gemfile: 'Gemfile.rails7_rmagick' }
+          - { ruby: '3.4', gemfile: 'Gemfile.rails7_mini_magick' }
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     name: Ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
     steps:
+      - name: Install ImageMagick
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y imagemagick
+          convert --version
       - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
diff --git a/Gemfile.rails5_mini_magick b/Gemfile.rails5_mini_magick
@@ -8,5 +8,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem "actionpack", "~> 5.2.8.1"
-gem "mini_magick"
+gem "mini_magick", "< 5.0"
 gem 'loofah', '<= 2.20.0' if RUBY_VERSION < '2.5'
diff --git a/Gemfile.rails5_rmagick b/Gemfile.rails5_rmagick
@@ -8,5 +8,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem "actionpack", "~> 5.2.8.1"
-gem "rmagick"
+gem "rmagick", "< 6.0"
 gem 'loofah', '<= 2.20.0' if RUBY_VERSION < '2.5'
diff --git a/Gemfile.rails6 b/Gemfile.rails6
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023 NAITOH Jun
+# Copyright (c) 2011-2025 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -8,3 +8,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem "actionpack", "~> 6.1.7.2"
+gem "concurrent-ruby", '1.3.4'
diff --git a/Gemfile.rails6_mini_magick b/Gemfile.rails6_mini_magick
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023 NAITOH Jun
+# Copyright (c) 2011-2025 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -8,4 +8,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem "actionpack", "~> 6.1.7.2"
-gem "mini_magick"
+gem "concurrent-ruby", '1.3.4'
+gem "mini_magick", "< 5.0"
diff --git a/Gemfile.rails6_rmagick b/Gemfile.rails6_rmagick
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023 NAITOH Jun
+# Copyright (c) 2011-2025 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -8,4 +8,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem "actionpack", "~> 6.1.7.2"
-gem "rmagick"
+gem "concurrent-ruby", '1.3.4'
+gem "rmagick", "< 6.0"
diff --git a/Gemfile.rails7 b/Gemfile.rails7
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023 NAITOH Jun
+# Copyright (c) 2011-2025 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -7,4 +7,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rbpdf.gemspec
 gemspec
 
-gem "actionpack", "~> 7.1.2"
+gem "actionpack", "~> 7.2.2.1"
diff --git a/Gemfile.rails7_mini_magick b/Gemfile.rails7_mini_magick
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023 NAITOH Jun
+# Copyright (c) 2011-2025 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -7,5 +7,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rbpdf.gemspec
 gemspec
 
-gem "actionpack", "~> 7.1.2"
-gem "mini_magick"
+gem "actionpack", "~> 7.2.2.1"
+gem "mini_magick", "< 5.0"
diff --git a/Gemfile.rails7_rmagick b/Gemfile.rails7_rmagick
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023 NAITOH Jun
+# Copyright (c) 2011-2025 NAITOH Jun
 # Released under the MIT license
 # http://www.opensource.org/licenses/MIT
 
@@ -7,5 +7,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rbpdf.gemspec
 gemspec
 
-gem "actionpack", "~> 7.1.2"
-gem "rmagick"
+gem "actionpack", "~> 7.2.2.1"
+gem "rmagick", "< 6.0"
