Add newer versions of Ruby and Rails to CI matrix (#176)

This PR adds Ruby 3.1 and 3.2 as well as Rails 6.1 and 7.0 to the CI matrix. As part of these changes we also:

1. Added `fail-fast: false` to the CI configuration to enable easier debugging
2. Removed the lockfiles so that dependencies can be rebuilt using current gems
3. Updated the rspec less than 3.10 requirement to be `~> 3.9.0` as opposed to `< 3.10.0` so that the `rspec-rails` requirement doesn't pull in a very old rspec
4. Removed the cache action and gem installation in the GitHub action configuration and instead used the bundler-cache functionality built into `ruby/setup-ruby`
5. Added Rails 6.1 and Rails 7.0 appraisals, but only for RSpec >= 3.10 (as `rspec-rails` prior to 5.0.0 did not support Rails 6.1, and `rspec-rails` requires at least `rspec` 3.10)
6. Only load `pry-byebug` / `pry-nav` for Ruby versions < 3.2
7. Correct the Rails 6.0 Appraisals entry and the corresponding gemfiles to use `~> 6.0.0`

Co-authored-by: Anton Rieder <aried3r@gmail.com>

Author: petergoldstein

.github/workflows/super_diff.yml

@@ -16,6 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         ruby:
           - 2.5
@@ -26,10 +27,15 @@ jobs:
           - rails_5_1
           - rails_5_2
           - rails_6_0
+          - rails_6_1
           - no_rails
         rspec_appraisal:
           - rspec_lt_3_10
           - rspec_gte_3_10
+        exclude:
+          - rails_appraisal: rails_6_1
+            rspec_appraisal: rspec_lt_3_10
+
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.rails_appraisal }}_${{ matrix.rspec_appraisal }}.gemfile
       JAVA_OPTS: "--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.io=org.jruby.dist"
@@ -40,26 +46,36 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - uses: actions/cache@v3
-        with:
-          path: vendor/bundle
-          key: v1-rubygems-local-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles(format('gemfiles/{0}_{1}.gemfile.lock', matrix.rails_appraisal, matrix.rspec_appraisal)) }}
-      - name: Install dependencies
-        run: bin/ci/install
+          bundler-cache: true
       - name: Run tests
         run: bin/ci/run-tests
   test_ruby_3:
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         ruby:
           - '3.0'
+          - '3.1'
+          - '3.2'
         rails_appraisal:
           - rails_6_0
+          - rails_6_1
+          - rails_7_0
           - no_rails
         rspec_appraisal:
           - rspec_lt_3_10
           - rspec_gte_3_10
+        exclude:
+          - ruby: 3.2
+            rails_appraisal: rails_6_0
+          - ruby: 3.2
+            rails_appraisal: rails_6_1
+          - rails_appraisal: rails_6_1
+            rspec_appraisal: rspec_lt_3_10
+          - rails_appraisal: rails_7_0
+            rspec_appraisal: rspec_lt_3_10
+
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.rails_appraisal }}_${{ matrix.rspec_appraisal }}.gemfile
       JAVA_OPTS: "--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.io=org.jruby.dist"
@@ -70,11 +86,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - uses: actions/cache@v3
-        with:
-          path: vendor/bundle
-          key: v1-rubygems-local-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles(format('gemfiles/{0}_{1}.gemfile.lock', matrix.rails_appraisal, matrix.rspec_appraisal)) }}
-      - name: Install dependencies
-        run: bin/ci/install
+          bundler-cache: true
       - name: Run tests
         run: bin/ci/run-tests

Appraisals

@@ -31,8 +31,22 @@ appraisals = {
   rails_6_0: proc {
     instance_eval(&rails_dependencies)
 
-    gem "activerecord", "~> 6.0"
-    gem "railties", "~> 6.0"
+    gem "activerecord", "~> 6.0.0"
+    gem "railties", "~> 6.0.0"
+    gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
+  },
+  rails_6_1: proc {
+    instance_eval(&rails_dependencies)
+
+    gem "activerecord", "~> 6.1.0"
+    gem "railties", "~> 6.1.0"
+    gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
+  },
+  rails_7_0: proc {
+    instance_eval(&rails_dependencies)
+
+    gem "activerecord", "~> 7.0.0"
+    gem "railties", "~> 7.0.0"
     gem "sqlite3", "~> 1.4.0", platform: [:ruby, :mswin, :mingw]
   },
   no_rails: proc {},
@@ -66,6 +80,11 @@ end
 
 if Gem::Requirement.new(">= 2.5.0").satisfied_by?(Gem::Version.new(RUBY_VERSION))
   rails_appraisals << :rails_6_0
+  rails_appraisals << :rails_6_1
+end
+
+if Gem::Requirement.new(">= 2.7.0").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  rails_appraisals << :rails_7_0
 end
 
 rspec_appraisals = [
@@ -80,6 +99,8 @@ rails_appraisals.each do |rails_appraisal|
         instance_eval(&appraisals.fetch(rails_appraisal))
         instance_exec(false, &appraisals.fetch(rspec_appraisal))
       end
+    elsif  %i(rails_6_1 rails_7_0).include?(rails_appraisal) && rspec_appraisal == :rspec_lt_3_10
+      next
     else
       appraise "#{rails_appraisal}_#{rspec_appraisal}" do
         instance_eval(&appraisals.fetch(rails_appraisal))