Update CI

Author: malomalo

.github/workflows/ci.yml

@@ -13,9 +13,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: ['7.2.2.1', '8.0.2']
-        ruby-version: ['3.2', '3.3', '3.4', '3.5.0-preview1']
-        postgres-version: ['17']
+        rails-version:
+          - 7.1
+          - 7.2
+          - 8.0
+          - 8.1
+        ruby-version:
+          - 3.3
+          - 3.4
+          - 4.0
+        postgres-version:
+          - 18
 
     steps:
       - name: Install Postgresql
@@ -35,7 +43,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Fix activerecord-postgis-adapter
-        if: ${{ matrix.rails == '8.0.1' }}
+        if: ${{ matrix.rails-version == '8.0.1' }}
         run: |
           echo "gem 'activerecord-postgis-adapter', github: 'rgeo/activerecord-postgis-adapter'" >> Gemfile
 
@@ -45,10 +53,11 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - run: |
-          sed -i -e "s/spec.add_runtime_dependency  *'activerecord',  *'>= [[:digit:]]\+\(\.[[:digit:]]\+\)*'/spec.add_runtime_dependency 'activerecord', '${{ matrix.rails }}'/" activerecord-filter.gemspec
+          sed -i -e "s/spec.add_runtime_dependency  *'activerecord',  *'>= [[:digit:]]\+\(\.[[:digit:]]\+\)*'/spec.add_runtime_dependency 'activerecord', '${{ matrix.rails-version }}'/" activerecord-filter.gemspec
           cat activerecord-filter.gemspec
           rm Gemfile.lock
-          bundle
+          bundle install --jobs=3 --retry=3
+          bundle update --jobs=3 --retry=3
 
       - run: bundle exec rake test
 
@@ -59,13 +68,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
-        ruby-version: ['3.4']
-        postgres-version: ['17']
+        rails-version:
+          - 7.1.6
+          - 7.2.3
+          - 8.0.4
+          - 8.1.1
+        ruby-version:
+          - 3.4
+        postgres-version:
+          - 18
         exclude:
-          - rails: '7.1.5.1'
+          - rails-version: '7.1.6'
             ruby-version: '3.4'
-            postgres-version: '17'
+            postgres-version: '18'
 
     steps:
       - name: Install Postgresql
@@ -91,7 +106,7 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
           pushd ~/rails
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
@@ -119,10 +134,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
-        ruby-version: ['3.4']
+        rails-version:
+          - 7.1.6
+          - 7.2.3
+          - 8.0.4
+          - 8.1.1
+        ruby-version:
+          - 3.4
         exclude:
-          - rails: '7.1.5.1'
+          - rails-version: '7.1.6'
             ruby-version: '3.4'
 
     steps:
@@ -135,7 +155,7 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
           pushd ~/rails
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
@@ -165,10 +185,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
-        ruby-version: ['3.4']
+        rails-version:
+          - 7.1.6
+          - 7.2.3
+          - 8.0.4
+          - 8.1.1
+        ruby-version:
+          - 3.4
         exclude:
-          - rails: '7.1.5.1'
+          - rails-version: '7.1.6'
             ruby-version: '3.4'
 
     steps:
@@ -187,7 +212,7 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
           pushd ~/rails
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile

test/test_helper.rb

@@ -8,7 +8,6 @@
 
 require 'byebug'
 require "minitest/autorun"
-require 'minitest/unit'
 require 'minitest/reporters'
 require 'active_record/filter'
 require 'faker'