Skip to content

Commit

Permalink
Update the CI matrix and fix test suite on Rails 7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
byroot committed Nov 22, 2023
1 parent 8b285d5 commit c6e8132
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [ '2.7', '3.0.2', '3.1', '3.2', 'head' ]
rails: [ '6.0', '6.1', '7.0', 'edge' ]
ruby: [ '2.7', '3.0', '3.1', '3.2', 'head' ]
rails: [ '6.1', '7.0', '7.1', 'edge' ]
exclude:
- ruby: '3.1'
rails: '6.0'
- ruby: '3.1'
rails: '6.1'
- ruby: '3.2'
rails: '6.0'
- ruby: '3.2'
rails: '6.1'

Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ gemspec

if ENV["RAILS_VERSION"] == "edge"
gem "activesupport", github: "rails/rails", branch: "main"
elsif ENV['RAILS_VERSION'] == "7.0"
gem "activesupport", ">= 7.0.0.alpha"
elsif ENV["RAILS_VERSION"]
gem "activesupport", "~> #{ENV["RAILS_VERSION"]}.0"
end
6 changes: 5 additions & 1 deletion test/support/application_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ def generate_files
end

rewrite_file(application.path("config/environments/test.rb")) do |c|
c.sub!(/config\.cache_classes\s*=\s*true/, "config.cache_classes = false")
if c.include?("config.cache_classes")
c.sub!(/config\.cache_classes\s*=\s*true/, "config.cache_classes = false")
else # 7.1+ doesn't have config.cache_classes in the config at all
c.sub!(/config.enable_reloading = false/, "config.enable_reloading = false\nconfig.cache_classes = false")
end
c
end

Expand Down

0 comments on commit c6e8132

Please sign in to comment.