From 6d106fcae3a3cb8bd065774de042cfe4455c434b Mon Sep 17 00:00:00 2001
From: Geremia Taglialatela <tagliala.dev@gmail.com>
Date: Mon, 1 Jan 2024 12:21:22 +0100
Subject: [PATCH] Improve CI

- Test against 3.3
- Do not test Rails edge against 2.7 (rails/rails#50491)
---
 .github/workflows/rubocop.yml |  2 +-
 .github/workflows/ruby.yml    | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 17891526..f96fd5c8 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2
+        ruby-version: '3.3'
         rubygems: latest
         bundler-cache: true
     - name: RuboCop
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index b4040dfd..ead4b190 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -29,17 +29,11 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         gemfile: [rails_6.0, rails_6.1, rails_7.0, rails_7.1]
         channel: ['stable']
 
         include:
-          - ruby-version: '2.7'
-            gemfile: rails_edge
-            channel: 'experimental'
-          - ruby-version: '3.0'
-            gemfile: rails_edge
-            channel: 'experimental'
           - ruby-version: '3.1'
             gemfile: rails_edge
             channel: 'experimental'
@@ -69,6 +63,10 @@ jobs:
             gemfile: rails_6.0
           - ruby-version: '3.2'
             gemfile: rails_6.1
+          - ruby-version: '3.3'
+            gemfile: rails_6.0
+          - ruby-version: '3.3'
+            gemfile: rails_6.1
 
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile