Run x86 macos in separate CI jobs

dvidelabs · Jun 7, 2024 · 76ee071 · 76ee071
1 parent ab67f1f
commit 76ee071
Showing 1 changed file with 37 additions and 22 deletions.
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -135,48 +135,63 @@ jobs:
           scripts/test.sh
 
   macos-clang:
-    name: macOS Clang (${{ matrix.runner == 'macos-13' && 'x86_64' || 'arm64' }})
-    runs-on: ${{ matrix.runner }}
+    name: macOS Clang
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - name: Build and run tests
+        run: |
+          scripts/initbuild.sh make-concurrent
+          scripts/test.sh
+
+  macos-clang-x86:
+    name: macOS Clang (x86)
+    runs-on: macos-13 # Last macos x86 runner
+    steps:
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - name: Build and run tests
+        run: |
+          scripts/initbuild.sh make-concurrent
+          scripts/test.sh
+
+  macos-gcc:
+    name: macOS GCC ${{ matrix.gcc-version }}
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
-        runner: [macos-13, macos-14]
+        gcc-version: [11, 14]
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - name: Prepare
+        run: |
+          # Install gcc if not already available.
+          brew list gcc@${{ matrix.gcc-version }} &>/dev/null || \
+            brew update && \
+            brew install gcc@${{ matrix.gcc-version }}
       - name: Build and run tests
+        env:
+          CC: gcc-${{ matrix.gcc-version }}
+          CXX: g++-${{ matrix.gcc-version }}
         run: |
           scripts/initbuild.sh make-concurrent
           scripts/test.sh
 
-  macos-gcc:
-    name: macOS GCC ${{ matrix.gcc-version }} (${{ matrix.runner == 'macos-13' && 'x86_64' || 'arm64' }})
-    runs-on: ${{ matrix.runner }}
+  macos-gcc-x86:
+    name: macOS GCC ${{ matrix.gcc-version }} (x86)
+    runs-on: macos-13 # Last macos x86 runner
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - runner: macos-13
-            gcc-version: 10
-          - runner: macos-13
-            gcc-version: 13
-            xcode-version: 14.3 # Required by prebuilt GCC 13.3 (15.0 default)
-
-          - runner: macos-14
-            gcc-version: 11 # First version available on arm64
-          - runner: macos-14
-            gcc-version: 13
-            xcode-version: 15.3 # Required by prebuilt GCC 13.3 (15.0 default)
+        gcc-version: [10, 14]
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       - name: Prepare
         run: |
           # Install gcc if not already available.
           brew list gcc@${{ matrix.gcc-version }} &>/dev/null || \
+            brew update && \
             brew install gcc@${{ matrix.gcc-version }}
-      - name: Switch to a working Xcode version
-        if: ${{ matrix.xcode-version }}
-        run: |
-          sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
       - name: Build and run tests
         env:
           CC: gcc-${{ matrix.gcc-version }}