-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
We have several gemfiles in which we have specific version requirements for `activejob` and `activerecord`, for use in our CI matrix. The current approach breaks on Ruby HEAD because it is detected as specifying multiple versions/sources for those gems. Instead, this refactors them to use an instance variable approach, similar to that used in Shopify/maintenance_tasks.
- Loading branch information
1 parent
742ee07
commit 1a1eb29
Showing
7 changed files
with
21 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
# frozen_string_literal: true | ||
|
||
eval_gemfile "../Gemfile" | ||
@rails_gems_requirements = "~> 5.2.0" | ||
|
||
gem "activejob", "~> 5.2.0" | ||
gem "activerecord", "~> 5.2.0" | ||
eval_gemfile "../Gemfile" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
# frozen_string_literal: true | ||
|
||
eval_gemfile "../Gemfile" | ||
@rails_gems_requirements = "~> 6.0.0" | ||
|
||
gem "activejob", "~> 6.0.0" | ||
gem "activerecord", "~> 6.0.0" | ||
eval_gemfile "../Gemfile" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
# frozen_string_literal: true | ||
|
||
@rails_gems_requirements = "~> 6.1.0" | ||
|
||
eval_gemfile "../Gemfile" | ||
|
||
if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("3.1") | ||
gem "net-imap", require: false | ||
gem "net-pop", require: false | ||
gem "net-smtp", require: false | ||
end | ||
|
||
gem "activejob", "~> 6.1.0" | ||
gem "activerecord", "~> 6.1.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
# frozen_string_literal: true | ||
|
||
eval_gemfile "../Gemfile" | ||
@rails_gems_requirements = "~> 7.0.0" | ||
|
||
gem "activejob", "~> 7.0.0" | ||
gem "activerecord", "~> 7.0.0" | ||
eval_gemfile "../Gemfile" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
# frozen_string_literal: true | ||
|
||
eval_gemfile "../Gemfile" | ||
@rails_gems_requirements = { github: "rails/rails", branch: "main" } | ||
|
||
gem "activejob", github: "rails/rails", branch: "main" | ||
gem "activerecord", github: "rails/rails", branch: "main" | ||
eval_gemfile "../Gemfile" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters