Skip to content

Fix build for Rails main, Rails 7.0 and Ruby 3.4 #2829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 18, 2025
Merged

Fix build for Rails main, Rails 7.0 and Ruby 3.4 #2829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
285ddb2
Require openssl for Rails 8.1
JonRowe Jan 17, 2025
b055a32
Drop git dependency for cucumber in favour of released
JonRowe Jan 17, 2025
9b9f069
Remove un-needed pin for unsupported Rails
JonRowe Jan 17, 2025
7b49919
Pin concurrent-ruby on old Rails to supported version
JonRowe Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ gem 'ffi', '> 1.15.5'
gem 'rake', '> 12'
gem 'rubocop', '~> 1.28.2'

if RUBY_VERSION.to_f > 3.3
gem 'cucumber', git: 'https://github.com/cucumber/cucumber-ruby', branch: 'main'
end

custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
eval_gemfile custom_gemfile if File.exist?(custom_gemfile)

Expand Down
3 changes: 2 additions & 1 deletion Gemfile-rails-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ when nil, false, ""
gem 'selenium-webdriver', require: false
else
version_number = version.split(' ').last
add_net_gems_dependency if version_number < '7.0'

gem 'concurrent-ruby', '1.3.4' if version_number < '7.1'

gem "rails", version
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
Expand Down
1 change: 1 addition & 0 deletions example_app_generator/spec/support/default_preview_path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ end
ENV['RAILS_ENV'] ||= 'development'
# Pick the frameworks you want:
begin
require "openssl"
require "active_storage"
require "active_storage/engine"
rescue LoadError
Expand Down
6 changes: 0 additions & 6 deletions example_app_generator/spec/verify_mailer_preview_path_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ def capture_exec(*ops)
CaptureExec.new(out, $?.exitstatus)
end

if ENV['RAILS_VERSION'] == 'main' && Rails::VERSION::STRING == "8.0.0.alpha"
before do
skip('This is broken on Rails main but is skipped for green builds, please fix')
end
end

if Rails::VERSION::STRING.to_f >= 7.1
let(:expected_custom_path) { "/custom/path\n#{::Rails.root}/test/mailers/previews" }
let(:expected_rspec_path) { "#{::Rails.root}/spec/mailers/previews\n#{::Rails.root}/test/mailers/previews" }
Expand Down
Loading