Merge pull request #451 from olivier-thatch/olivier-ci-ruby33-rails71

Add Ruby 3.3 and Rails 7.1 to CI matrix
Shopify · Jan 23, 2024 · cd18c89 · cd18c89
2 parents d247a14 + 131f869
commit cd18c89
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git 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
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+@rails_gems_requirements = "~> 7.1.0"
+
+eval_gemfile "../Gemfile"