Skip to content

Commit

Permalink
Add rails main
Browse files Browse the repository at this point in the history
  • Loading branch information
adamstegman committed Jan 4, 2024
1 parent 4f9a6d9 commit 3c062d4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ _references:
- "~> 7.1.0"
- "~> 7.0.0"
- "~> 6.1.0"
- "main"

orbs:
ruby: circleci/[email protected]
Expand Down
13 changes: 10 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ source 'https://rubygems.org'
gemspec

# Lock Rails down in the matrix build, but not by default
gem "activesupport", ENV.fetch("RAILS_VERSION", nil)
gem "activerecord", ENV.fetch("RAILS_VERSION", nil)
gem "railties", ENV.fetch("RAILS_VERSION", nil)
rails_version = ENV.fetch("RAILS_VERSION", nil)
if rails_version == "main"
gem "activesupport", github: "rails/rails", branch: "main"
gem "activerecord", github: "rails/rails", branch: "main"
gem "railties", github: "rails/rails", branch: "main"
elsif rails_version
gem "activesupport", rails_version
gem "activerecord", rails_version
gem "railties", rails_version
end

0 comments on commit 3c062d4

Please sign in to comment.