Skip to content

Commit 9f4a5de

Browse files
authored
Merge pull request rspec#2778 from rspec/add-rails-7.2-to-matrix
Add Rails 7.2 to CI matrix
2 parents 8c17b4e + cf0eb8d commit 9f4a5de

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,29 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
include:
39-
# Edge Rails (?) builds >= 2.7
39+
# Edge Rails (?) builds >= 3.1
4040
- ruby: 3.2
4141
env:
4242
RAILS_VERSION: 'main'
4343
- ruby: 3.1
4444
env:
4545
RAILS_VERSION: 'main'
4646

47+
# Rails 7.2 builds >= 3.1
48+
- ruby: 3.3
49+
env:
50+
RAILS_VERSION: '~> 7.2.0'
51+
- ruby: 3.2
52+
env:
53+
RAILS_VERSION: '~> 7.2.0'
54+
- ruby: 3.1
55+
env:
56+
RAILS_VERSION: '~> 7.2.0'
57+
4758
# Rails 7.1 builds >= 2.7
59+
- ruby: 3.3
60+
env:
61+
RAILS_VERSION: '~> 7.1.0'
4862
- ruby: 3.2
4963
env:
5064
RAILS_VERSION: '~> 7.1.0'

example_app_generator/generate_app.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
copy_file capybara_backport_path, 'spec/support/capybara.rb'
6969

70-
if Rails::VERSION::STRING > '7'
70+
if Rails::VERSION::STRING > '7' && Rails::VERSION::STRING < '7.2'
7171
create_file 'app/assets/config/manifest.js' do
7272
"//= link application.css"
7373
end

example_app_generator/spec/support/default_preview_path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ exit(0) if ENV['NO_ACTION_MAILER']
6969
if ENV['DEFAULT_URL']
7070
puts ActionMailer::Base.default_url_options[:host]
7171
elsif defined?(::ActionMailer::Preview)
72-
if Rails::VERSION::STRING.start_with?('7.1')
72+
if Rails::VERSION::STRING.to_f >= 7.1
7373
puts Rails.application.config.action_mailer.preview_paths
7474
else
7575
puts Rails.application.config.action_mailer.preview_path

spec/sanity_check_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ def with_clean_env
2828
expect(`bundle exec #{script} 2>&1`)
2929
.to match(/uninitialized constant RSpec::Support/)
3030
.or match(/undefined method `require_rspec_core' for RSpec::Support:Module/)
31+
.or match(/undefined method `require_rspec_core' for module RSpec::Support/)
3132

3233
expect($?.exitstatus).to eq(1)
3334
end

0 commit comments

Comments
 (0)