From 5bdfe600bb370dd71cdda205a23972e140ad95f8 Mon Sep 17 00:00:00 2001
From: Alex Reinking <areinking@adobe.com>
Date: Thu, 20 Jun 2024 16:38:24 -0400
Subject: [PATCH] Update CI to run on macOS

---
 .github/workflows/ci.yml | 42 +++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b30be13..00904de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,26 +8,33 @@ on:
   pull_request:
 jobs:
   test-linux:
-    name: Test Linux ${{ matrix.CC }}
-    runs-on: ubuntu-24.04
+    name: Test ${{ matrix.name }} ${{ matrix.CC }}
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          # Clang 18 is broken for some reason
-          # - CC: clang-18
-          #   CXX: clang++-18
-          #   CXXFLAGS: -stdlib=libc++
-          - CC: gcc-14
+          - name: Linux
+            runner: ubuntu-24.04
+            CC: gcc-14
+            CXX: g++-14
+          - name: macOS
+            runner: macos-14
+            CC: gcc-14
             CXX: g++-14
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - name: Install build dependencies
+      - name: Install APT dependencies
+        if: matrix.name == 'Linux'
         run: sudo apt-get install ninja-build libc++-18-dev libc++abi-18-dev
 
+      - name: Install Homebrew dependencies
+        if: matrix.name == 'macOS'
+        run: brew install ninja gcc@14
+
       - name: Run test script
         timeout-minutes: 12
         run: ./test-all.sh
@@ -45,21 +52,4 @@ jobs:
 
       - name: Run test script
         timeout-minutes: 12
-        run: ./test-all.ps1
-  test-macos:
-    name: Test macOS
-    runs-on: macos-14
-    env:
-      CC: /opt/homebrew/opt/llvm@18/bin/clang
-      CXX: /opt/homebrew/opt/llvm@18/bin/clang++
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Install build dependencies
-        run: brew install ninja llvm@18
-
-      - name: Run test script
-        timeout-minutes: 12
-        run: ./test-all.sh
+        run: ./test-all.ps1
\ No newline at end of file