From 131f8693fdf3b4707f6d9a26090385c07c2ca491 Mon Sep 17 00:00:00 2001
From: Olivier Bellone <olivier@thatch.ai>
Date: Tue, 16 Jan 2024 12:50:47 -0800
Subject: [PATCH] Add Ruby 3.3 and Rails 7.1 to CI matrix

---
 .github/workflows/ci.yml   | 26 +++++++++++++++++++-------
 gemfiles/rails_7_1.gemfile |  5 +++++
 2 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 gemfiles/rails_7_1.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1bdfee4b..642f5c92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,29 +14,41 @@ jobs:
           - 6379:6379
     strategy:
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2"]
-        gemfile: [rails_5_2, rails_6_0, rails_6_1, rails_7_0, rails_edge]
+        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
+        gemfile: [rails_5_2, rails_6_0, rails_6_1, rails_7_0, rails_7_1, rails_edge]
         exclude:
           - ruby: "2.6"
             gemfile: rails_7_0
+          - ruby: "2.6"
+            gemfile: rails_7_1
           - ruby: "2.6"
             gemfile: rails_edge
           - ruby: "2.7"
-            gemfile: rails_edge
-          - ruby: "3.0"
+            gemfile: rails_7_1
+          - ruby: "2.7"
             gemfile: rails_edge
           - ruby: "3.0"
             gemfile: rails_5_2
+          - ruby: "3.0"
+            gemfile: rails_7_1
+          - ruby: "3.0"
+            gemfile: rails_edge
           - ruby: "3.1"
             gemfile: rails_5_2
-          - ruby: "3.2"
-            gemfile: rails_5_2
           - ruby: "3.1"
             gemfile: rails_6_0
+          - ruby: "3.2"
+            gemfile: rails_5_2
           - ruby: "3.2"
             gemfile: rails_6_0
           - ruby: "3.2"
             gemfile: rails_6_1
+          - ruby: "3.3"
+            gemfile: rails_5_2
+          - ruby: "3.3"
+            gemfile: rails_6_0
+          - ruby: "3.3"
+            gemfile: rails_6_1
 
         include:
           - ruby: head
@@ -70,7 +82,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "3.3"
           bundler-cache: true
       - name: Rubocop
         run: bundle exec rubocop
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
new file mode 100644
index 00000000..7eded52f
--- /dev/null
+++ b/gemfiles/rails_7_1.gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+@rails_gems_requirements = "~> 7.1.0"
+
+eval_gemfile "../Gemfile"