Skip to content

Commit c7d24a1

Browse files
naitohnaitoh
authored
Merge pull request #104 from naitoh/support_ruby_3_4_rails7_2
Support Ruby 3.4 and Rails 8.0
2 parents d078d84 + 83d7b25 commit c7d24a1

12 files changed

+65
-24
lines changed

‎.github/workflows/test.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
ruby: ['jruby', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
12+
ruby: ['jruby', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
1313
gemfile: ['Gemfile.rbpdf-font']
1414
include:
1515
- { ruby: 'jruby', gemfile: 'Gemfile.rails7' }
@@ -25,25 +25,30 @@ jobs:
2525
- { ruby: '2.6', gemfile: 'Gemfile.rails6' }
2626
- { ruby: '2.6', gemfile: 'Gemfile.rails6_rmagick' }
2727
- { ruby: '2.6', gemfile: 'Gemfile.rails6_mini_magick' }
28-
- { ruby: '2.7', gemfile: 'Gemfile.rails7' }
29-
- { ruby: '2.7', gemfile: 'Gemfile.rails7_rmagick' }
30-
- { ruby: '2.7', gemfile: 'Gemfile.rails7_mini_magick' }
31-
- { ruby: '3.0', gemfile: 'Gemfile.rails7' }
32-
- { ruby: '3.0', gemfile: 'Gemfile.rails7_rmagick' }
33-
- { ruby: '3.0', gemfile: 'Gemfile.rails7_mini_magick' }
28+
- { ruby: '2.7', gemfile: 'Gemfile.rails6' }
29+
- { ruby: '2.7', gemfile: 'Gemfile.rails6_rmagick' }
30+
- { ruby: '2.7', gemfile: 'Gemfile.rails6_mini_magick' }
31+
- { ruby: '3.0', gemfile: 'Gemfile.rails6' }
32+
- { ruby: '3.0', gemfile: 'Gemfile.rails6_rmagick' }
33+
- { ruby: '3.0', gemfile: 'Gemfile.rails6_mini_magick' }
3434
- { ruby: '3.1', gemfile: 'Gemfile.rails7' }
3535
- { ruby: '3.1', gemfile: 'Gemfile.rails7_rmagick' }
3636
- { ruby: '3.1', gemfile: 'Gemfile.rails7_mini_magick' }
3737
- { ruby: '3.2', gemfile: 'Gemfile.rails7' }
3838
- { ruby: '3.2', gemfile: 'Gemfile.rails7_rmagick' }
3939
- { ruby: '3.2', gemfile: 'Gemfile.rails7_mini_magick' }
40-
- { ruby: '3.3', gemfile: 'Gemfile.rails7' }
41-
- { ruby: '3.3', gemfile: 'Gemfile.rails7_rmagick' }
42-
- { ruby: '3.3', gemfile: 'Gemfile.rails7_mini_magick' }
40+
- { ruby: '3.3', gemfile: 'Gemfile.rails8' }
41+
- { ruby: '3.3', gemfile: 'Gemfile.rails8_rmagick' }
42+
- { ruby: '3.3', gemfile: 'Gemfile.rails8_mini_magick' }
43+
- { ruby: '3.4', gemfile: 'Gemfile.rails8' }
44+
- { ruby: '3.4', gemfile: 'Gemfile.rails8_rmagick' }
45+
- { ruby: '3.4', gemfile: 'Gemfile.rails8_mini_magick' }
4346
env:
4447
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
4548
name: Ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
4649
steps:
50+
- name: Install ImageMagick
51+
run: sudo apt-get update && sudo apt-get install -y imagemagick libmagickwand-dev && convert --version
4752
- uses: actions/checkout@v3
4853
- name: Set up Ruby
4954
uses: ruby/setup-ruby@v1

‎Gemfile.rails5_mini_magick

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ source 'https://rubygems.org'
88
gemspec
99

1010
gem "actionpack", "~> 5.2.8.1"
11-
gem "mini_magick"
11+
gem "mini_magick", "< 5.0"
1212
gem 'loofah', '<= 2.20.0' if RUBY_VERSION < '2.5'

‎Gemfile.rails5_rmagick

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ source 'https://rubygems.org'
88
gemspec
99

1010
gem "actionpack", "~> 5.2.8.1"
11-
gem "rmagick"
11+
gem "rmagick", "< 6.0"
1212
gem 'loofah', '<= 2.20.0' if RUBY_VERSION < '2.5'

‎Gemfile.rails6

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2011-2023 NAITOH Jun
1+
# Copyright (c) 2011-2025 NAITOH Jun
22
# Released under the MIT license
33
# http://www.opensource.org/licenses/MIT
44

@@ -8,3 +8,4 @@ source 'https://rubygems.org'
88
gemspec
99

1010
gem "actionpack", "~> 6.1.7.2"
11+
gem "concurrent-ruby", '1.3.4'

‎Gemfile.rails6_mini_magick

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2011-2023 NAITOH Jun
1+
# Copyright (c) 2011-2025 NAITOH Jun
22
# Released under the MIT license
33
# http://www.opensource.org/licenses/MIT
44

@@ -8,4 +8,5 @@ source 'https://rubygems.org'
88
gemspec
99

1010
gem "actionpack", "~> 6.1.7.2"
11-
gem "mini_magick"
11+
gem "concurrent-ruby", '1.3.4'
12+
gem "mini_magick", "< 5.0"

‎Gemfile.rails6_rmagick

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2011-2023 NAITOH Jun
1+
# Copyright (c) 2011-2025 NAITOH Jun
22
# Released under the MIT license
33
# http://www.opensource.org/licenses/MIT
44

@@ -8,4 +8,5 @@ source 'https://rubygems.org'
88
gemspec
99

1010
gem "actionpack", "~> 6.1.7.2"
11-
gem "rmagick"
11+
gem "concurrent-ruby", '1.3.4'
12+
gem "rmagick", "< 6.0"

‎Gemfile.rails7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2011-2023 NAITOH Jun
1+
# Copyright (c) 2011-2025 NAITOH Jun
22
# Released under the MIT license
33
# http://www.opensource.org/licenses/MIT
44

@@ -7,4 +7,4 @@ source 'https://rubygems.org'
77
# Specify your gem's dependencies in rbpdf.gemspec
88
gemspec
99

10-
gem "actionpack", "~> 7.1.2"
10+
gem "actionpack", "~> 7.2.2.1"

‎Gemfile.rails7_mini_magick

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2011-2023 NAITOH Jun
1+
# Copyright (c) 2011-2025 NAITOH Jun
22
# Released under the MIT license
33
# http://www.opensource.org/licenses/MIT
44

@@ -7,5 +7,5 @@ source 'https://rubygems.org'
77
# Specify your gem's dependencies in rbpdf.gemspec
88
gemspec
99

10-
gem "actionpack", "~> 7.1.2"
11-
gem "mini_magick"
10+
gem "actionpack", "~> 7.2.2.1"
11+
gem "mini_magick", "< 5.0"

‎Gemfile.rails7_rmagick

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2011-2023 NAITOH Jun
1+
# Copyright (c) 2011-2025 NAITOH Jun
22
# Released under the MIT license
33
# http://www.opensource.org/licenses/MIT
44

@@ -7,5 +7,5 @@ source 'https://rubygems.org'
77
# Specify your gem's dependencies in rbpdf.gemspec
88
gemspec
99

10-
gem "actionpack", "~> 7.1.2"
10+
gem "actionpack", "~> 7.2.2.1"
1111
gem "rmagick"

‎Gemfile.rails8

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Copyright (c) 2011-2025 NAITOH Jun
2+
# Released under the MIT license
3+
# http://www.opensource.org/licenses/MIT
4+
5+
source 'https://rubygems.org'
6+
7+
# Specify your gem's dependencies in rbpdf.gemspec
8+
gemspec
9+
10+
gem "actionpack", "~> 8.0.2"

0 commit comments

Comments
 (0)