Avoid using Rails 7.0.0 directly (#1658)

This is a way to workaround rails/rails#43998
getsentry · Dec 31, 2021 · 83597d2 · 83597d2
1 parent 5883c9d
commit 83597d2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/sentry-delayed_job/Gemfile b/sentry-delayed_job/Gemfile
@@ -14,7 +14,7 @@ gem "rexml"
 
 gem "delayed_job"
 gem "delayed_job_active_record"
-gem "rails"
+gem "rails", "< 7.0"
 gem "activerecord-jdbcmysql-adapter", platform: :jruby
 gem "jdbc-sqlite3", platform: :jruby
 gem "sqlite3", platform: :ruby

diff --git a/sentry-rails/Gemfile b/sentry-rails/Gemfile
@@ -6,17 +6,23 @@ gem "sentry-ruby", path: "../sentry-ruby"
 
 rails_version = ENV["RAILS_VERSION"]
 rails_version = "6.1.0" if rails_version.nil?
+rails_version = Gem::Version.new(rails_version)
 
 gem 'activerecord-jdbcmysql-adapter', platform: :jruby
 gem "jdbc-sqlite3", platform: :jruby
 
-if rails_version.to_f < 6
+if rails_version < Gem::Version.new("6.0.0")
   gem "sqlite3", "~> 1.3.0", platform: :ruby
 else
   gem "sqlite3", platform: :ruby
 end
 
-gem "rails", "~> #{rails_version}"
+if rails_version >= Gem::Version.new("7.0.0")
+  gem "rails", github: "rails/rails", branch: "7-0-stable"
+else
+  gem "rails", "~> #{rails_version}"
+end
+
 gem "sprockets-rails"
 
 gem "sidekiq"

diff --git a/sentry-resque/Gemfile b/sentry-resque/Gemfile
@@ -9,7 +9,7 @@ gem 'simplecov'
 gem "simplecov-cobertura", "~> 1.4"
 gem "rexml"
 
-gem "rails"
+gem "rails", "< 7.0"
 
 gem "sentry-ruby", path: "../sentry-ruby"
 gem "sentry-rails", path: "../sentry-rails"

diff --git a/sentry-sidekiq/Gemfile b/sentry-sidekiq/Gemfile
@@ -12,7 +12,7 @@ gem "rexml"
 sidekiq_version = ENV["SIDEKIQ_VERSION"]
 sidekiq_version = "6.0" if sidekiq_version.nil?
 
-gem "rails"
+gem "rails", "< 7.0"
 gem "sidekiq", "~> #{sidekiq_version}"
 
 gem "sentry-ruby", path: "../sentry-ruby"