Skip to content

Commit

Permalink
Merge pull request #22 from tricknotes/test-on-rails-main
Browse files Browse the repository at this point in the history
Test on rails main
  • Loading branch information
tricknotes authored Nov 2, 2024
2 parents 44b7fd8 + 6eafb58 commit 831f149
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
matrix:
ruby: ["2.7", "3.0", "3.1", "3.2"]
rails: ["6.1", "7.0"]
include:
- ruby: "3.2"
rails: "main"

env:
RAILS_ENV: test
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ rails_version = ENV.fetch("RAILS_VERSION", "6.0")

if rails_version == "main"
rails_constraint = { github: "rails/rails" }
gem "rack", "< 3" # To compatible with capybara. https://github.com/teamcapybara/capybara/issues/2640
else
rails_constraint = "~> #{rails_version}"
end
Expand Down

0 comments on commit 831f149

Please sign in to comment.