From 8c45bf1a0ce7dcb0bb380f8a13c858ca58c6c5d6 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Fri, 25 Feb 2022 13:39:13 -0300
Subject: [PATCH] Reorganize test matrix & use latest bundler

* Rails and Ruby versions follow the most recent to oldest, except for
  Rails main, so we can keep the Gemfile the first one.
* Excluding specific matrix combinations based on the Gemfile first,
  Ruby version next, and keep the same order (most recent -> oldest)
* Quote all Ruby versions to keep things consistent. It's required for
  the '3.0' version to avoid the float issue where it'd use the latest
  3.x instead.
* Test Rails 6.1 with Ruby 3.1, as Rails test suite supports it.

Also update Changelog with the 3.1 Ruby support addition.
---
 .github/workflows/test.yml | 48 ++++++++++++++++++--------------------
 CHANGELOG.md               |  2 +-
 Gemfile.lock               |  2 +-
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fa92ea98..240c4c06 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,35 +7,33 @@ jobs:
       matrix:
         gemfile:
           - Gemfile
-          - gemfiles/Gemfile-rails-5-2
-          - gemfiles/Gemfile-rails-6-0
-          - gemfiles/Gemfile-rails-6-1
           - gemfiles/Gemfile-rails-main
+          - gemfiles/Gemfile-rails-6-1
+          - gemfiles/Gemfile-rails-6-0
+          - gemfiles/Gemfile-rails-5-2
         ruby:
-          - 2.5
-          - 2.6
-          - 2.7
+          - '3.1'
           - '3.0'
-          - 3.1
+          - '2.7'
+          - '2.6'
+          - '2.5'
         exclude:
-          - ruby: 2.5
-            gemfile: gemfiles/Gemfile-rails-main
-          - ruby: 2.6
-            gemfile: gemfiles/Gemfile-rails-main
-          - ruby: 2.5
-            gemfile: Gemfile
-          - ruby: 2.6
-            gemfile: Gemfile
-          - ruby: 2.7
-            gemfile: gemfiles/Gemfile-rails-5-2
-          - ruby: 3.0
-            gemfile: gemfiles/Gemfile-rails-5-2
-          - ruby: 3.1
-            gemfile: gemfiles/Gemfile-rails-5-2
-          - ruby: 3.1
-            gemfile: gemfiles/Gemfile-rails-6-0
-          - ruby: 3.1
-            gemfile: gemfiles/Gemfile-rails-6-1
+          - gemfile: Gemfile
+            ruby: '2.6'
+          - gemfile: Gemfile
+            ruby: '2.5'
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.6'
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.5'
+          - gemfile: gemfiles/Gemfile-rails-6-0
+            ruby: '3.1'
+          - gemfile: gemfiles/Gemfile-rails-5-2
+            ruby: '3.1'
+          - gemfile: gemfiles/Gemfile-rails-5-2
+            ruby: '3.0'
+          - gemfile: gemfiles/Gemfile-rails-5-2
+            ruby: '2.7'
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 526c8995..43cfcd51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Unreleased
 
-* Add support for Rails 7.0 (no changes required)
+* Add support for Rails 7.0 and Ruby 3.1 (no changes required)
 
 ## 5.1.0
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 543c35e5..502eb539 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,4 +90,4 @@ DEPENDENCIES
   simple_form!
 
 BUNDLED WITH
-   2.1.4
+   2.3.8