Merge remote-tracking branch 'origin/master'

.github/workflows/test.yml

@@ -50,27 +50,17 @@ jobs:
           - 6379:6379
 
     strategy:
+      fail-fast: false
       matrix:
-        gemfile: ['rails_5.2', 'rails_6.0', 'rails_6.1']
+        gemfile: ['rails_6.0', 'rails_6.1', 'rails_7.0']
 
-        ruby: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0']
+        ruby: ['2.7', '3.0', '3.1']
 
         client: ['active_record', 'redis']
 
         exclude:
-          # Rails 5.2 requires Ruby < 3.0
-          # https://github.com/rails/rails/issues/40938
-          - ruby: '3.0'
-            gemfile: 'rails_5.2'
-          # Rails >= 6 need Ruby >= 2.5
-          - ruby: '2.3'
-            gemfile: 'rails_6.0'
-          - ruby: '2.4'
-            gemfile: 'rails_6.0'
-          - ruby: '2.3'
-            gemfile: 'rails_6.1'
-          - ruby: '2.4'
-            gemfile: 'rails_6.1'
+          - ruby: '2.7'
+            gemfile: 'rails_7.0'
 
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
@@ -100,3 +90,15 @@ jobs:
         # The default PostgreSQL port
         POSTGRES_PORT: 5432
         CLIENT: ${{ matrix.client }}
+
+  tests:
+    runs-on: ubuntu-latest
+    needs: test
+    if: always()
+    steps:
+      - name: All tests ok
+        if: ${{ !(contains(needs.*.result, 'failure')) }}
+        run: exit 0
+      - name: Some tests failed
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1

.rubocop.yml

@@ -6,7 +6,8 @@ AllCops:
   Exclude:
     - lib/generators/**/*
     - vendor/bundle/**/*
-  TargetRubyVersion: 2.3
+  NewCops: enable
+  TargetRubyVersion: 2.4
 
 Layout/LineLength:
   Enabled: false