Skip to content

Commit

Permalink
Execute CI against rails/rails main
Browse files Browse the repository at this point in the history
In preparation for troubleshooting [hotwired#243][], this
commit expands the GitHub Actions CI matrix to account for both
`rails@~>6.1` and `rails@main`.

[hotwired#243]: hotwired#243
  • Loading branch information
seanpdoyle committed Oct 9, 2021
1 parent f4c86a4 commit 222fa7b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 184 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Expand Up @@ -7,6 +7,9 @@ jobs:
ruby-version:
- "2.7"
- "3.0"
rails-version:
- "6.1"
- "main"
continue-on-error: [ false ]

# Disabled until minitest relaxes its upper bound: https://github.com/seattlerb/minitest/pull/862
Expand All @@ -16,7 +19,10 @@ jobs:
# - ruby-version: head
# continue-on-error: true

name: ${{ format('Tests (Ruby {0})', matrix.ruby-version) }}
env:
RAILS_VERSION: "${{ matrix.rails-version }}"

name: ${{ format('Tests (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.continue-on-error }}

Expand Down
1 change: 1 addition & 0 deletions .gitignore
@@ -1,2 +1,3 @@
*.gem
/node_modules
Gemfile.lock
10 changes: 10 additions & 0 deletions Gemfile
Expand Up @@ -2,6 +2,16 @@ source 'https://rubygems.org'

gemspec

rails_version = ENV.fetch("RAILS_VERSION", "6.1")

if rails_version == "main"
rails_constraint = { github: "rails/rails" }
else
rails_constraint = "~> #{rails_version}.0"
end

gem "rails", rails_constraint

gem 'rake'
gem 'byebug'
gem 'puma'
Expand Down
183 changes: 0 additions & 183 deletions Gemfile.lock

This file was deleted.

0 comments on commit 222fa7b

Please sign in to comment.