Support Rails 7, Ruby 3.1

bshand · bshand · commit 65d59fe9bba9 · 2022-01-14T15:02:27.000Z
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,13 +7,30 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - 2.6
-          - 2.7
-          - 3.0
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
         gemfile:
           - gemfiles/Gemfile.rails52
           - gemfiles/Gemfile.rails60
           - gemfiles/Gemfile.rails61
+          - gemfiles/Gemfile.rails70
+        exclude:
+          # rails 5.2 requires ruby < 3.0
+          # https://github.com/rails/rails/issues/40938
+          - ruby-version: '3.0'
+            gemfile: 'gemfiles/Gemfile.rails52'
+          - ruby-version: '3.1'
+            gemfile: 'gemfiles/Gemfile.rails52'
+          # rails 6.0 requires ruby < 3.1
+          # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+          - ruby-version: '3.1'
+            gemfile: 'gemfiles/Gemfile.rails60'
+          # rails 7.0 requires ruby >= 2.7
+          # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+          - ruby-version: '2.6'
+            gemfile: 'gemfiles/Gemfile.rails70'
 
     name: Ruby ${{ matrix.ruby-version }} / Bundle ${{ matrix.gemfile }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ## [Unreleased]
-*no unreleased changes*
+* Support Rails 7, Ruby 3.1
 
 ## 6.0.1 / 2021-07-09
 ### Fixed
diff --git a/gemfiles/Gemfile.rails70 b/gemfiles/Gemfile.rails70
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'activesupport', '~> 7.0.0'
diff --git a/ndr_dev_support.gemspec b/ndr_dev_support.gemspec
@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'webdrivers', '>= 3.9'
 
   # CI server dependencies:
-  spec.add_dependency 'activesupport', '< 7'
+  spec.add_dependency 'activesupport', '< 7.1'
   spec.add_dependency 'brakeman', '>= 4.7.1'
   spec.add_dependency 'bundler-audit'
   spec.add_dependency 'github-linguist'
