From d0291006da9f31f2da5096874531c585a8f5c7b8 Mon Sep 17 00:00:00 2001
From: Gareth Jones <Jones258@Gmail.com>
Date: Sat, 9 Mar 2024 10:59:47 +1300
Subject: [PATCH] ci: test against Ruby 3.1 and 3.2, and Node 20 (#433)

* ci: test against Ruby 3.1 and 3.2

* ci: test against Node 20
---
 .github/workflows/generator.yml | 7 ++++++-
 .github/workflows/node.yml      | 4 ++--
 .github/workflows/ruby.yml      | 9 +++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
index 02319dc53..91afec245 100644
--- a/.github/workflows/generator.yml
+++ b/.github/workflows/generator.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.7', '3.0']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
         use_package_json_gem: ['true', 'false']
         gemfile:
           - gemfiles/Gemfile-rails.6.0.x
@@ -28,6 +28,11 @@ jobs:
           # Uncomment the following line only to ensure compatibility with the
           # upcomming Rails versions, maybe before a release.
           #- gemfiles/Gemfile-rails-edge
+        exclude:
+          - ruby: '3.1'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.2'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index a3a866908..f6ee83974 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14.x, 16.x, 18.x]
+        node: [14.x, 16.x, 18.x, 20.x]
 
     runs-on: ${{ matrix.os }}
 
@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14.x, 16.x, 18.x]
+        node: [14.x, 16.x, 18.x, 20.x]
 
     runs-on: ${{ matrix.os }}
 
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 2c4a74190..9cfd17b5b 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.7', '3.0']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
 
     steps:
       - uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.7', '3.0']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
         gemfile:
           - gemfiles/Gemfile-rails.6.0.x
           - gemfiles/Gemfile-rails.6.1.x
@@ -47,6 +47,11 @@ jobs:
           # Uncomment the following line only to ensure compatibility with the
           # upcomming Rails versions, maybe before a release.
           #- gemfiles/Gemfile-rails-edge
+        exclude:
+          - ruby: '3.1'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+          - ruby: '3.2'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}