From bb6ad47f37eef42bc3a0728a016ee6226ea2293e Mon Sep 17 00:00:00 2001
From: Darby Johnston <darbyjohnston@yahoo.com>
Date: Tue, 30 Jan 2024 17:39:43 -0800
Subject: [PATCH] Add macos-14 build

---
 .github/workflows/ci-workflow.yml | 56 +++++++++++++++++++++++++++++++
 etc/macOS/macos-build-gha.sh      |  3 +-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 3e7dec62..aab9e5ac 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -214,7 +214,61 @@ jobs:
     runs-on: macos-12
 
     env:
+      TLRENDER_PYTHON: OFF
+      TLRENDER_API: GL_4_1
+      TLRENDER_GLFW: ON
+      TLRENDER_NET: OFF
+      TLRENDER_OCIO: ON
+      TLRENDER_AUDIO: ON
+      TLRENDER_JPEG: ON
+      TLRENDER_TIFF: ON
+      TLRENDER_STB: ON
+      TLRENDER_PNG: ON
+      TLRENDER_EXR: ON
+      TLRENDER_FFMPEG: ON
+      TLRENDER_USD: OFF
+      TLRENDER_NFD: OFF
+      TLRENDER_QT5: OFF
+      TLRENDER_PROGRAMS: ON
+      TLRENDER_EXAMPLES: ON
+      TLRENDER_TESTS: ON
+      TLRENDER_GCOV: OFF
       CMAKE_OSX_DEPLOYMENT_TARGET: 10.15
+      CMAKE_OSX_ARCHITECTURES: x86_64
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
+    # \bug DYLD_LIBRARY_PATH is not being set here?
+    - name: Setup environment
+      run: |
+        echo "$PWD/build/install/bin" >> $GITHUB_PATH
+        echo "DYLD_LIBRARY_PATH=$PWD/build/install/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "PYTHONPATH=$PWD/build/install/lib:$PYTHONPATH" >> $GITHUB_ENV
+        cmake --version
+        python --version
+
+    - name: Build tlRender
+      run: |
+        export DYLD_LIBRARY_PATH=$PWD/build/install/lib:$DYLD_LIBRARY_PATH
+        bash etc/macOS/macos-build-gha.sh Debug
+
+    - name: Run tests
+      run: |
+        export DYLD_LIBRARY_PATH=$PWD/build/install/lib:$DYLD_LIBRARY_PATH
+        cd build
+        cd tlRender/src/tlRender-build
+        tests/tltest/tltest
+
+  macos-arm-build:
+    runs-on: macos-14
+
+    env:
       TLRENDER_PYTHON: OFF
       TLRENDER_API: GL_4_1
       TLRENDER_GLFW: ON
@@ -234,6 +288,8 @@ jobs:
       TLRENDER_EXAMPLES: ON
       TLRENDER_TESTS: ON
       TLRENDER_GCOV: OFF
+      CMAKE_OSX_DEPLOYMENT_TARGET: 14
+      CMAKE_OSX_ARCHITECTURES: arm64
 
     steps:
     - uses: actions/checkout@v3
diff --git a/etc/macOS/macos-build-gha.sh b/etc/macOS/macos-build-gha.sh
index f2797bc7..eeea2a28 100644
--- a/etc/macOS/macos-build-gha.sh
+++ b/etc/macOS/macos-build-gha.sh
@@ -30,5 +30,6 @@ cmake ../etc/SuperBuild \
     -DTLRENDER_EXAMPLES=$TLRENDER_EXAMPLES \
     -DTLRENDER_TESTS=$TLRENDER_TESTS \
     -DTLRENDER_GCOV=$TLRENDER_GCOV \
-    -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+    -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} \
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
 cmake --build . -j 4 --config $BUILD_TYPE