From 0881563ffd0a3f1db45c5f36d6f6abd69cf7e35a Mon Sep 17 00:00:00 2001
From: George Ma <george.ma@shopify.com>
Date: Mon, 1 Apr 2024 22:59:40 -0400
Subject: [PATCH] Update the CI test configuration and rubocop-next

After updating rubocop to 1.61.0, there was a CI error when running
on the ruby-3.4 ci (HEAD). That error on ruby-3.4 was a result of the
better_html gem needing to be updated. This updated better_html gem is
not compatible with Ruby 2.7 so I skipped running it on ruby-2.7.
---
 .github/workflows/test.yml    | 5 ++++-
 gemfiles/Gemfile.rubocop-next | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 44eca5d6..930d2271 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,8 +5,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2, 3.3, head]
+        ruby: [2.7, 3.0, 3.1, 3.2, 3.3, head]
         gemfile: [rubocop-next, rubocop-old]
+        exclude:
+          - ruby: 2.7
+            gemfile: rubocop-next
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.gemfile }}
diff --git a/gemfiles/Gemfile.rubocop-next b/gemfiles/Gemfile.rubocop-next
index 48f29505..0e619ab2 100644
--- a/gemfiles/Gemfile.rubocop-next
+++ b/gemfiles/Gemfile.rubocop-next
@@ -2,4 +2,4 @@
 
 eval_gemfile "../Gemfile"
 
-gem "rubocop", ">= 1.38.0"
+gem "rubocop", ">= 1.61.0"