Skip to content

Fix Rails 7 build #2523

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 8 commits into from
Oct 2, 2021
Merged

Fix Rails 7 build #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1bd603c
Remove explicit dependency on rack for our build
pirj Oct 1, 2021
f71a2d9
Remove explicit arel dependency
pirj Oct 1, 2021
045bfc9
Remove explicit dependency on journey
pirj Oct 1, 2021
a1061e6
Remove explicit dependency on i18n
pirj Oct 1, 2021
6a55a6b
Adjust removal of `rails` from example app Gemfile
pirj Oct 1, 2021
c034af3
Also remove the newly introduced `debug` gem
pirj Oct 1, 2021
af7d012
Also remove selenium-webdriver from example app
pirj Oct 1, 2021
acaa4f3
Create sprockets manifest for example app
pirj Oct 1, 2021
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-rails-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ version_file = File.expand_path("../.rails-version", __FILE__)
case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
when /master/
gem "rails", :git => "https://github.com/rails/rails.git"
gem "arel", :git => "https://github.com/rails/arel.git"
gem "journey", :git => "https://github.com/rails/journey.git"
gem "activerecord-deprecated_finders", :git => "https://github.com/rails/activerecord-deprecated_finders.git"
gem "web-console", :git => "https://github.com/rails/web-console", :group => :development
gem 'coffee-rails', :git => "https://github.com/rails/coffee-rails.git"
gem 'rack', :git => 'https://github.com/rack/rack.git'
gem 'i18n', :git => 'https://github.com/svenfuchs/i18n.git', :branch => 'master'
gem 'sprockets', :git => 'https://github.com/rails/sprockets.git', :branch => 'master'
gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git', :branch => 'master'
gem 'puma', "3.12.1"
Expand Down
12 changes: 10 additions & 2 deletions example_app_generator/generate_app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@

# Remove the existing rails version so we can properly use main or other
# edge branches
gsub_file 'Gemfile', /^.*\bgem 'rails.*$/, ''
gsub_file 'Gemfile', /^.*\bgem ['"]rails.*$/, ''
gsub_file 'Gemfile', /^.*\bgem ['"]selenium\-webdriver.*$/, ''
gsub_file "Gemfile", /.*web-console.*/, ''
gsub_file "Gemfile", /.*debugger.*/, ''
gsub_file "Gemfile", /.*debug.*/, ''
gsub_file "Gemfile", /.*puma.*/, ''
gsub_file "Gemfile", /.*bootsnap.*/, ''

Expand Down Expand Up @@ -77,4 +78,11 @@
'REPLACE_BUNDLE_PATH',
bundle_install_path
chmod 'ci_retry_bundle_install.sh', 0755

if Rails::VERSION::STRING > '7'
create_file 'app/assets/config/manifest.js' do
"//= link application.css"
end
create_file 'app/assets/stylesheets/application.css'
end
end