Fix CI (#197)

enkessler · May 30, 2024 · 4315989 · 4315989
1 parent 9c0d345
commit 4315989
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,13 +5,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu, macos, windows ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
         ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', jruby, truffleruby ]
+        # CRuby < 2.6 does not support macos-arm64, so test those on amd64 instead
+        # JRuby 9.4.7.0 does not have native console support on macos-arm64: https://github.com/jruby/jruby/issues/8271
+        include:
+        - { os: macos-13, ruby: '2.4' }
+        - { os: macos-13, ruby: '2.5' }
+        - { os: macos-13, ruby: jruby }
         exclude:
-        - { os: windows, ruby: truffleruby }
+        - { os: macos-latest, ruby: '2.4' }
+        - { os: macos-latest, ruby: '2.5' }
+        - { os: macos-latest, ruby: jruby }
+        - { os: windows-latest, ruby: truffleruby }
         # fails to load rspec: RuntimeError: CRITICAL: RUBYGEMS_ACTIVATION_MONITOR.owned?: before false -> after true
-        - { os: windows, ruby: jruby }
-    runs-on: ${{ matrix.os }}-latest
+        - { os: windows-latest, ruby: jruby }
+    runs-on: ${{ matrix.os }}
     env:
       CHILDPROCESS_UNSET: should-be-unset
     steps: