chore: Update CI config to run on Ruby 3.0 through 3.3 (#26534)

googleapis · Jul 26, 2024 · 3ce51ce · 3ce51ce
1 parent cbb6fa1
commit 3ce51ce
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -6,11 +6,11 @@ branchProtectionRules:
   isAdminEnforced: false
   requiredStatusCheckContexts:
     - 'cla/google'
-    - 'CI (ubuntu-latest, 2.7, --test)'
     - 'CI (ubuntu-latest, 3.0, --test)'
     - 'CI (ubuntu-latest, 3.1, --test)'
-    - 'CI (ubuntu-latest, 3.2, --rubocop --build --test)'
-    - 'CI (ubuntu-latest, 3.2, --yard --linkinator)'
+    - 'CI (ubuntu-latest, 3.2, --test)'
+    - 'CI (ubuntu-latest, 3.3, --test)'
+    - 'CI (ubuntu-latest, 3.3, --rubocop-toplevel --rubocop --build --yard --linkinator)'
   requiredApprovingReviewCount: 1
   requiresCodeOwnerReviews: true
   requiresStrictStatusChecks: false

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,9 +26,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
-            ruby: "2.7"
-            task: "--test"
           - os: ubuntu-latest
             ruby: "3.0"
             task: "--test"
@@ -37,19 +34,19 @@ jobs:
             task: "--test"
           - os: ubuntu-latest
             ruby: "3.2"
-            task: "--rubocop --build --test"
+            task: "--test"
           - os: ubuntu-latest
-            ruby: "3.2"
-            task: "--yard --linkinator"
+            ruby: "3.3"
+            task: "--test"
+          - os: ubuntu-latest
+            ruby: "3.3"
+            task: "--rubocop-toplevel --rubocop --build --yard --linkinator"
           - os: macos-latest
-            ruby: "3.2"
+            ruby: "3.3"
             task: "--test"
           - os: windows-latest
-            ruby: "3.2"
+            ruby: "3.3"
             task: "--test"
-          - os: ubuntu-latest
-            ruby: "3.2"
-            task: "--rubocop-toplevel"
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -59,10 +56,10 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"
-    - name: Install NodeJS 16.x
+    - name: Install NodeJS 18.x
       uses: actions/setup-node@v4
       with:
-        node-version: "16.x"
+        node-version: "18.x"
     - name: Install tools
       run: "gem install --no-document toys && npm install linkinator"
     - name: Test ${{ matrix.task }}

diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,12 @@
 source "https://rubygems.org"
 
 gem "gems", "~> 1.2"
-gem "google-style", "~> 1.26.3"
-gem "minitest", "~> 5.14"
-gem "minitest-focus", "~> 1.1"
-gem "minitest-rg", "~> 5.2"
+gem "google-style", "~> 1.30.0"
+gem "minitest", "~> 5.24"
+gem "minitest-focus", "~> 1.4"
+gem "minitest-rg", "~> 5.3"
 gem "rake", "~> 13.0"
-gem "rubocop", "~> 1.13"
-gem "yard", "~> 0.9", ">= 0.9.26"
+gem "yard", "~> 0.9", ">= 0.9.36"
 
 gem "pry", "~> 0.14.1"