From dfdf61d8e692c9de0722395fa6416f32dd2b9e1e Mon Sep 17 00:00:00 2001
From: Orien Madgwick <497874+orien@users.noreply.github.com>
Date: Sun, 5 May 2024 20:04:04 +1000
Subject: [PATCH] CI: Add Ruby 3.3 to the test matrix (#221)

---
 .github/workflows/ci-workflow.yml         | 11 ++++++-----
 README.md                                 | 10 +++++-----
 spec/support/gemfiles/Gemfile.rails-6.1.x |  7 ++++---
 spec/support/gemfiles/Gemfile.rails-7.0.x |  7 ++++---
 spec/support/gemfiles/Gemfile.rails-7.1.x |  7 ++++---
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 160dd2b..9ce999c 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -1,15 +1,16 @@
 name: CI
 on: [push, pull_request]
 jobs:
-  build:
+  test:
+    name: 'Test (Ruby: ${{ matrix.ruby }}, Rails: ${{ matrix.rails }}, DB: ${{ matrix.db }})'
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.0', '3.1', '3.2']
-        gemfile: [Gemfile.rails-6.1.x, Gemfile.rails-7.0.x, Gemfile.rails-7.1.x]
+        ruby: ['3.3', '3.2', '3.1', '3.0']
+        rails: ['7.1', '7.0', '6.1']
         db: [mysql, postgres, sqlite]
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/spec/support/gemfiles/${{ matrix.gemfile }}
+      BUNDLE_GEMFILE: ${{ github.workspace }}/spec/support/gemfiles/Gemfile.rails-${{ matrix.rails }}.x
       DB: ${{ matrix.db }}
     services:
       mysql:
@@ -38,7 +39,7 @@ jobs:
           - 5432:5432
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
diff --git a/README.md b/README.md
index 0535d4c..c845bec 100644
--- a/README.md
+++ b/README.md
@@ -22,15 +22,15 @@ DoubleEntry uses the [Money gem](https://github.com/RubyMoney/money) to encapsul
 DoubleEntry is tested against:
 
 Ruby
- * 2.7.x
- * 3.0.x
- * 3.1.x
+ * 3.3.x
  * 3.2.x
+ * 3.1.x
+ * 3.0.x
 
 Rails
- * 6.0.x
- * 6.1.x
+ * 7.1.x
  * 7.0.x
+ * 6.1.x
 
 Databases
  * MySQL
diff --git a/spec/support/gemfiles/Gemfile.rails-6.1.x b/spec/support/gemfiles/Gemfile.rails-6.1.x
index ba067e8..f3c6870 100644
--- a/spec/support/gemfiles/Gemfile.rails-6.1.x
+++ b/spec/support/gemfiles/Gemfile.rails-6.1.x
@@ -4,6 +4,7 @@ gemspec path: '../../../'
 
 gem 'activerecord', '~> 6.1.0'
 
-# Rails imposed mysql2 version contraints
-# https://github.com/rails/rails/blob/6-1-stable/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
-gem 'mysql2', '>= 0.5'
+# Rails imposed database gem constraints
+gem 'mysql2', '~> 0.5' # https://github.com/rails/rails/blob/6-1-stable/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
+gem 'pg', '~> 1.1' # https://github.com/rails/rails/blob/6-1-stable/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L3
+gem 'sqlite3', '~> 1.4' # https://github.com/rails/rails/blob/6-1-stable/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L14
diff --git a/spec/support/gemfiles/Gemfile.rails-7.0.x b/spec/support/gemfiles/Gemfile.rails-7.0.x
index b6a9c0a..5fc29c6 100644
--- a/spec/support/gemfiles/Gemfile.rails-7.0.x
+++ b/spec/support/gemfiles/Gemfile.rails-7.0.x
@@ -4,6 +4,7 @@ gemspec path: '../../../'
 
 gem 'activerecord', '~> 7.0.0'
 
-# Rails imposed mysql2 version contraints
-# https://github.com/rails/rails/blob/7-0-stable/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
-gem 'mysql2', '~> 0.5'
+# Rails imposed database gem constraints
+gem 'mysql2', '~> 0.5' # https://github.com/rails/rails/blob/7-0-stable/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
+gem 'pg', '~> 1.1' # https://github.com/rails/rails/blob/7-0-stable/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L3
+gem 'sqlite3', '~> 1.4' # https://github.com/rails/rails/blob/7-0-stable/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L14
diff --git a/spec/support/gemfiles/Gemfile.rails-7.1.x b/spec/support/gemfiles/Gemfile.rails-7.1.x
index 7be035d..7617a0a 100644
--- a/spec/support/gemfiles/Gemfile.rails-7.1.x
+++ b/spec/support/gemfiles/Gemfile.rails-7.1.x
@@ -4,6 +4,7 @@ gemspec path: '../../../'
 
 gem 'activerecord', '~> 7.1.0'
 
-# Rails imposed mysql2 version contraints
-# https://github.com/rails/rails/blob/7-1-stable/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
-gem 'mysql2', '~> 0.5'
+# Rails imposed database gem constraints
+gem 'mysql2', '~> 0.5' # https://github.com/rails/rails/blob/7-1-stable/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
+gem 'pg', '~> 1.1' # https://github.com/rails/rails/blob/7-1-stable/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L3
+gem 'sqlite3', '~> 1.4' # https://github.com/rails/rails/blob/7-1-stable/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L14