Improve testing matrix for this gem.

Consistently run all tests against both the latest released Rails version as well
as Rails edge. Also drop tests for Ruby 3.2 as it is EOL.

Author: andrewn617

.github/workflows/dependencies.yml

@@ -39,8 +39,14 @@ jobs:
         name: Bundle update adapters
         run: |
           for gemfile_path in gemfiles/*.gemfile; do
+            # Edge Gemfiles intentionally have no lockfile so CI resolves rails/main at run time.
+            case "${gemfile_path}" in
+              *_edge.gemfile) continue ;;
+            esac
+
             BUNDLE_GEMFILE="${gemfile_path}" bundle update
           done
+          rm -f gemfiles/*_edge.gemfile.lock
       -
         name: Create Pull Request
         id: cpr

.github/workflows/test.yml

@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   semian:
-    name: Ruby ${{ matrix.ruby }} / semian
+    name: Ruby ${{ matrix.ruby }} / semian / Rails ${{ matrix.rails_version }}
     runs-on: ubuntu-latest
     container:
       image: ruby:${{ matrix.ruby }}
@@ -28,14 +28,21 @@ jobs:
       options: --hostname http-server
     env:
       CI: "1"
-      BUNDLE_GEMFILE: Gemfile
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         ruby:
           - "3.4"
           - "3.3"
-          - "3.2"
+        gemfile:
+          - Gemfile
+          - gemfiles/rails_edge.gemfile
+        include:
+          - gemfile: Gemfile
+            rails_version: released
+          - gemfile: gemfiles/rails_edge.gemfile
+            rails_version: edge
     services:
       mysql:
         image: mysql:9.3
@@ -74,9 +81,9 @@ jobs:
         with:
           path: vendor/bundle
           # yamllint disable-line rule:line-length
-          key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-gems-${{ hashFiles( format('{0}.lock', env.BUNDLE_GEMFILE) ) }}
+          key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-semian-${{ matrix.rails_version }}-gems-${{ hashFiles(env.BUNDLE_GEMFILE, format('{0}.lock', env.BUNDLE_GEMFILE)) }}
           restore-keys: |
-            ${{ runner.os }}-ruby-${{ matrix.ruby }}-gems-
+            ${{ runner.os }}-ruby-${{ matrix.ruby }}-semian-${{ matrix.rails_version }}-gems-
       -
         name: Bundle
         run: |
@@ -122,18 +129,21 @@ jobs:
         ruby:
           - "3.4"
           - "3.3"
-          - "3.2"
         gemfile:
           - grpc
           - mysql2
           - net_http
           - rails_mysql2
+          - rails_mysql2_edge
           - rails_trilogy
+          - rails_trilogy_edge
           - redis_4
           - redis_5
           - redis_client
           - activerecord_trilogy_adapter
+          - activerecord_trilogy_adapter_edge
           - activerecord_postgresql_adapter
+          - activerecord_postgresql_adapter_edge
         include:
           - gemfile: grpc
             adapter: grpc
@@ -143,8 +153,12 @@ jobs:
             adapter: net_http
           - gemfile: rails_mysql2
             adapter: rails_mysql2
+          - gemfile: rails_mysql2_edge
+            adapter: rails_mysql2
           - gemfile: rails_trilogy
             adapter: rails_trilogy
+          - gemfile: rails_trilogy_edge
+            adapter: rails_trilogy
           - gemfile: redis_4
             adapter: redis
           - gemfile: redis_5
@@ -153,8 +167,12 @@ jobs:
             adapter: redis_client
           - gemfile: activerecord_trilogy_adapter
             adapter: activerecord_trilogy_adapter
+          - gemfile: activerecord_trilogy_adapter_edge
+            adapter: activerecord_trilogy_adapter
           - gemfile: activerecord_postgresql_adapter
             adapter: activerecord_postgresql_adapter
+          - gemfile: activerecord_postgresql_adapter_edge
+            adapter: activerecord_postgresql_adapter
     services:
       mysql:
         image: mysql:9.3
@@ -193,7 +211,7 @@ jobs:
         with:
           path: vendor/bundle
           # yamllint disable-line rule:line-length
-          key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-adapter-${{ matrix.gemfile }}-gems-${{ hashFiles( format('{0}.lock', env.BUNDLE_GEMFILE) ) }}
+          key: ${{ runner.os }}-ruby-${{ matrix.ruby }}-adapter-${{ matrix.gemfile }}-gems-${{ hashFiles(env.BUNDLE_GEMFILE, format('{0}.lock', env.BUNDLE_GEMFILE)) }}
           restore-keys: |
             ${{ runner.os }}-ruby-${{ matrix.ruby }}-adapter-${{ matrix.gemfile }}-gems-
       -

.gitignore

@@ -7,6 +7,7 @@
 .vscode/ipch
 .vscode/launch.json
 *.gem
+gemfiles/*_edge.gemfile.lock
 *.swo
 *.swp
 /checksums/

Gemfile

@@ -10,7 +10,7 @@ group :test do
   gem "benchmark-memory"
   gem "benchmark-ips"
   gem "memory_profiler"
-  gem "minitest"
+  gem "minitest", "5.26.2"
   gem "mocha"
   gem "pry-byebug", require: false
   gem "toxiproxy"
@@ -22,7 +22,7 @@ group :test do
   gem "mysql2", "~> 0.5"
   gem "trilogy", "~> 2.9"
   gem "pg", "~> 1.6"
-  gem "activerecord", github: "rails/rails", branch: "main"
+  gem "activerecord", "~> 8.1.0"
   gem "hiredis", "~> 0.6"
   # NOTE: v0.12.0 required for ruby 3.2.0. https://github.com/redis-rb/redis-client/issues/58
   gem "hiredis-client", ">= 0.12.0"

Gemfile.lock

@@ -11,6 +11,6 @@ gem "webrick"
 gem "concurrent-ruby"
 
 gem "pg", "~> 1.6"
-gem "activerecord", github: "rails/rails"
+gem "activerecord", "~> 8.1.0"
 
 gemspec path: "../"

gemfiles/activerecord_postgresql_adapter.gemfile

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "rake-compiler"
+gem "minitest"
+gem "mocha"
+gem "toxiproxy"
+gem "webrick"
+gem "concurrent-ruby"
+
+gem "pg", "~> 1.6"
+gem "activerecord", github: "rails/rails", branch: "main"
+
+gemspec path: "../"

gemfiles/activerecord_postgresql_adapter.gemfile.lock

@@ -11,6 +11,6 @@ gem "webrick"
 gem "concurrent-ruby"
 
 gem "trilogy", "~> 2.4"
-gem "activerecord", github: "rails/rails"
+gem "activerecord", "~> 8.1.0"
 
 gemspec path: "../"