Skip to content

Commit

Permalink
Merge pull request #2355 from tvdeyen/fix-rails-7-builds
Browse files Browse the repository at this point in the history
Use released Rails gems again for local testing
  • Loading branch information
tvdeyen committed Jul 25, 2022

Verified

This commit was signed with the committer’s verified signature. The key has expired.
tvdeyen Thomas von Deyen
1 parent f2997d9 commit dd22dd8
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -4,15 +4,7 @@ source "https://rubygems.org"
gemspec

rails_version = ENV.fetch("RAILS_VERSION", 7.0).to_f
# Necessary until a new 6.1.5 version has been released
# https://github.com/rails/rails/pull/44691
if rails_version.to_s.match?(/6.1/)
gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
elsif rails_version.to_s.match?(/7.0/)
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
else
gem "rails", "~> #{rails_version}.0"
end
gem "rails", "~> #{rails_version}.0"

if ENV["DB"].nil? || ENV["DB"] == "sqlite"
gem "sqlite3", "~> 1.4.1"

0 comments on commit dd22dd8

Please sign in to comment.