From 0fc983c86cdf49f0ce46618aab67e765e32ee0db Mon Sep 17 00:00:00 2001
From: Dan Allen <dan.j.allen@gmail.com>
Date: Sun, 26 Dec 2021 23:59:03 -0700
Subject: add Ruby 3.1 to CI matrix; update error message transformation to
 account for changes

---
 .github/workflows/ci.yml                | 14 +++++++++-----
 .github/workflows/release.yml           |  3 +--
 .github/workflows/upstream-dispatch.yml |  3 +--
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f3e0bee..25566335 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Install Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: '3.1'
     - name: Configure Bundler
       run: |
         bundle config --local path .bundle/gems
@@ -41,15 +41,19 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        ruby: [jruby-9.2, '2.5', '2.6', '2.7', '3.0']
+        ruby: [jruby-9.2, '2.5', '2.7', '3.0', '3.1']
         rouge-version: [~]
         upstream: [~]
         exclude:
+        # remove 3.1 on ubuntu-latest to mark as primary
         - os: ubuntu-latest
-          ruby: '3.0'
+          ruby: '3.1'
+        # remove 3.1 on windows as it's not yet available
+        - os: windows-latest
+          ruby: '3.1'
         include:
         - os: macos-latest
-          ruby: '3.0'
+          ruby: '3.1'
         # NOTE: enable once Asciidoctor 2.1.0 is released
         #- os: ubuntu-latest
         #  ruby: '2.5'
@@ -61,7 +65,7 @@ jobs:
           ruby: '3.0'
           upstream: upstream
         - os: ubuntu-latest
-          ruby: '3.0'
+          ruby: '3.1'
           primary: primary
     runs-on: ${{ matrix.os }}
     env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fdfa5a7f..0d9080f6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,8 +18,7 @@ jobs:
     - name: Install Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
-        bundler: '2.2'
+        ruby-version: '3.1'
     - name: Configure Bundler
       run: |
         bundle config --local path .bundle/gems
diff --git a/.github/workflows/upstream-dispatch.yml b/.github/workflows/upstream-dispatch.yml
index 1eae1eae..e7d6e7e1 100644
--- a/.github/workflows/upstream-dispatch.yml
+++ b/.github/workflows/upstream-dispatch.yml
@@ -14,8 +14,7 @@ jobs:
     - name: Install Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
-        bundler: '2.2'
+        ruby-version: '3.1'
     - name: Configure Bundler
       run: |
         bundle config --local clean true
-- 
cgit v1.2.3