Merge pull request #119 from rake-compiler/flavorjones-arm64-darwin-c…

…overage ci: add arm64-darwin coverage
rake-compiler · May 1, 2024 · a494383 · a494383
2 parents 2497e6e + 7f81378
commit a494383
Showing 1 changed file with 31 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -143,9 +143,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu]
+        os: [ubuntu-latest]
         ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -261,39 +261,47 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos]
+        os: [macos-13, macos-14]
         ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5", "2.4"]
+        exclude:
+          # setup-ruby does not provide ruby 2.4 or 2.5 on arm64-darwin as of 2024-05-01
+          - os: macos-14
+            ruby: "2.4"
+          - os: macos-14
+            ruby: "2.5"
         include:
-          - os: macos
+          - os: macos-13
             platform: x86_64-darwin
-          - os: ubuntu
+          - os: macos-14
+            platform: arm64-darwin
+          - os: ubuntu-latest
             ruby: jruby
             platform: jruby
-          - os: windows
+          - os: windows-latest
             ruby: "2.4"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.5"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.6"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.7"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "3.0"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "3.1"
             platform: x64-mingw-ucrt
-          - os: windows
+          - os: windows-latest
             ruby: "3.2"
             platform: x64-mingw-ucrt
-          - os: windows
+          - os: windows-latest
             ruby: "3.3"
             platform: x64-mingw-ucrt
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -321,31 +329,31 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows
+          - os: windows-latest
             ruby: "2.4"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.5"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.6"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "2.7"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "3.0"
             platform: x64-mingw32
-          - os: windows
+          - os: windows-latest
             ruby: "3.1"
             platform: x64-mingw-ucrt
-          - os: windows
+          - os: windows-latest
             ruby: "3.2"
             platform: x64-mingw-ucrt
-          - os: windows
+          - os: windows-latest
             ruby: "3.3"
             platform: x64-mingw-ucrt
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1