From 222fa7b4db1698baeff0551af245e02171347157 Mon Sep 17 00:00:00 2001 From: Sean Doyle Date: Sat, 9 Oct 2021 14:29:17 -0400 Subject: [PATCH] Execute CI against `rails/rails` main In preparation for troubleshooting [hotwired/turbo-rails#243][], this commit expands the GitHub Actions CI matrix to account for both `rails@~>6.1` and `rails@main`. [hotwired/turbo-rails#243]: https://github.com/hotwired/turbo-rails/issues/243 --- .github/workflows/ci.yml | 8 +- .gitignore | 1 + Gemfile | 10 +++ Gemfile.lock | 183 --------------------------------------- 4 files changed, 18 insertions(+), 184 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e8a6338..6316d8d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 }} diff --git a/.gitignore b/.gitignore index 12055688..bc00769d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.gem /node_modules +Gemfile.lock diff --git a/Gemfile b/Gemfile index 001e9325..c97fef54 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index ce29ab51..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,183 +0,0 @@ -PATH - remote: . - specs: - turbo-rails (0.8.1) - rails (>= 6.0.0) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.1.4.1) - actionpack (= 6.1.4.1) - activesupport (= 6.1.4.1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.1) - actionpack (= 6.1.4.1) - activejob (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.1) - mail (>= 2.7.1) - actionmailer (6.1.4.1) - actionpack (= 6.1.4.1) - actionview (= 6.1.4.1) - activejob (= 6.1.4.1) - activesupport (= 6.1.4.1) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.4.1) - actionview (= 6.1.4.1) - activesupport (= 6.1.4.1) - rack (~> 2.0, >= 2.0.9) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.1) - actionpack (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.1) - nokogiri (>= 1.8.5) - actionview (6.1.4.1) - activesupport (= 6.1.4.1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.1) - activesupport (= 6.1.4.1) - globalid (>= 0.3.6) - activemodel (6.1.4.1) - activesupport (= 6.1.4.1) - activerecord (6.1.4.1) - activemodel (= 6.1.4.1) - activesupport (= 6.1.4.1) - activestorage (6.1.4.1) - actionpack (= 6.1.4.1) - activejob (= 6.1.4.1) - activerecord (= 6.1.4.1) - activesupport (= 6.1.4.1) - marcel (~> 1.0.0) - mini_mime (>= 1.1.0) - activesupport (6.1.4.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - builder (3.2.4) - byebug (11.1.3) - capybara (3.35.3) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - childprocess (3.0.0) - concurrent-ruby (1.1.9) - crass (1.0.6) - erubi (1.10.0) - globalid (0.5.2) - activesupport (>= 5.0) - i18n (1.8.10) - concurrent-ruby (~> 1.0) - importmap-rails (0.5.1) - rails (>= 6.0.0) - loofah (2.12.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.1) - method_source (1.0.0) - mini_mime (1.1.1) - mini_portile2 (2.6.1) - minitest (5.14.4) - nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) - racc (~> 1.4) - public_suffix (4.0.6) - puma (5.3.1) - nio4r (~> 2.0) - racc (1.5.2) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.1.4.1) - actioncable (= 6.1.4.1) - actionmailbox (= 6.1.4.1) - actionmailer (= 6.1.4.1) - actionpack (= 6.1.4.1) - actiontext (= 6.1.4.1) - actionview (= 6.1.4.1) - activejob (= 6.1.4.1) - activemodel (= 6.1.4.1) - activerecord (= 6.1.4.1) - activestorage (= 6.1.4.1) - activesupport (= 6.1.4.1) - bundler (>= 1.15.0) - railties (= 6.1.4.1) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (6.1.4.1) - actionpack (= 6.1.4.1) - activesupport (= 6.1.4.1) - method_source - rake (>= 0.13) - thor (~> 1.0) - rake (13.0.3) - regexp_parser (2.1.1) - rexml (3.2.5) - rubyzip (2.3.0) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) - sprockets (4.0.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.4.2) - thor (1.1.0) - tzinfo (2.0.4) - concurrent-ruby (~> 1.0) - webdrivers (4.6.0) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) - zeitwerk (2.4.2) - -PLATFORMS - ruby - -DEPENDENCIES - byebug - capybara - importmap-rails - puma - rake - rexml - selenium-webdriver - sqlite3 - turbo-rails! - webdrivers - -BUNDLED WITH - 2.2.16