Skip to content

Commit 6c719da

Browse files
authored
Merge pull request #197 from voxik/rails8-ruby34
Add Rails 8.0.x and Ruby 3.4.x to ci matrix
2 parents 246af3b + 4e6228f commit 6c719da

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,25 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3', 'head', 'truffleruby' ]
10-
rails: [ '6.1', '7.0', '7.1', 'main' ]
9+
ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'head', 'truffleruby' ]
10+
rails: [ '6.1', '7.0', '7.1', '8.0', 'main' ]
1111
exclude:
1212
- ruby: '2.7'
1313
rails: 'main'
14+
- ruby: '2.7'
15+
rails: '8.0'
16+
- ruby: '3.0'
17+
rails: '8.0'
1418
- ruby: '3.0'
1519
rails: 'main'
20+
- ruby: '3.1'
21+
rails: '8.0'
1622
- ruby: '3.1'
1723
rails: 'main'
24+
- ruby: '3.4'
25+
rails: '6.1'
26+
- ruby: '3.4'
27+
rails: '7.0'
1828

1929
env:
2030
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile

gemfiles/rails_8.0.gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source "https://rubygems.org"
2+
3+
gem "activemodel", "~> 8.0.0"
4+
gem "railties", "~> 8.0.0"
5+
6+
gemspec path: "../"

test/cases/railtie_test.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ def setup
1616
@app.config.eager_load = false
1717
@app.config.logger = Logger.new(nil)
1818
@app.config.secret_key_base = ('x' * 30)
19-
@app.config.active_support.cache_format_version = Rails::VERSION::STRING.to_f
19+
# Rails supports `cache_format` up to `7.1`.
20+
# https://github.com/rails/rails/blob/aa66aece44f191e6330c04ce4942c3edf31d85d7/activesupport/lib/active_support/cache.rb#L800-L809
21+
@app.config.active_support.cache_format_version = if Rails::VERSION::STRING.to_f < 8
22+
Rails::VERSION::STRING.to_f
23+
else
24+
7.1
25+
end
2026
end
2127

2228
test 'GlobalID.app for Blog::Application defaults to blog' do

0 commit comments

Comments
 (0)