From 9d549253bcc52a75f766b2848604aece6c02d537 Mon Sep 17 00:00:00 2001
From: Austin Ziegler <austin@zieglers.ca>
Date: Mon, 4 Jul 2022 20:19:40 -0400
Subject: Update CI support

Resolves #82 (differently)
---
 .github/workflows/ci.yml | 63 +++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae2f4f4..04c754d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,63 +9,56 @@ name: CI
 
 on:
   push:
-    branches: [master, main]
+    branches: [main]
   pull_request:
-    branches: [master, main]
+    branches: [main]
 
 jobs:
   test:
     strategy:
       matrix:
         os:
-          - ubuntu
-          - macos
-          - windows
+          - macos-10.15
+          - macos-11
+          - ubuntu-20.04
         ruby:
           - '2.4'
           - '2.5'
           - '2.6'
           - '2.7'
           - '3.0'
+          - '3.1'
           - head
-          - debug
-          - mingw
-          - mswin
           - jruby
           - jruby-head
           - truffleruby
           - truffleruby-head
-        exclude:
-          - os: macos
+          - truffleruby+graalvm
+          - truffleruby+graalvm-head
+        include:
+          - ruby: head
+            continue-on-error: true
+          - ruby: jruby-head
+            continue-on-error: true
+          - os: windows-latest
             ruby: mingw
-          - os: macos
+          - os: windows-latest
             ruby: mswin
-          - os: ubuntu
-            ruby: mingw
-          - os: ubuntu
-            ruby: mswin
-          - os: windows
-            ruby: debug
-          - os: windows
+          - os: windows-latest
             ruby: jruby
-          - os: windows
-            ruby: jruby-head
-          - os: windows
-            ruby: truffleruby
-          - os: windows
-            ruby: truffleruby-head
-    runs-on: ${{ matrix.os }}-latest
-    continue-on-error: ${{
-      endsWith(matrix.ruby, 'head') ||
-      matrix.ruby == 'debug' ||
-      (startsWith(matrix.ruby, 'jruby') && matrix.os == 'windows')
-      }}
+            continue-on-error: true
+          - os: ubuntu-22.04
+            ruby: head
+          - os: ubuntu-22.04
+            ruby: '3.1'
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.continue-on-error || false }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true # 'bundle install' and cache
+          rubygems: latest
+          bundler-cache: true
       - name: Run tests
-        run: bundle exec ruby -S rake spec --trace
+        run: bundle exec ruby -S rake test --trace
-- 
cgit v1.2.1