Change names

darbyjohnston · Jan 31, 2024 · 44e2026 · 44e2026
1 parent bb6ad47
commit 44e2026
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -210,7 +210,7 @@ jobs:
         name: tlRender-Linux-Packages
         path: build/tlRender/src/tlRender-build/tlRender-*.tar.gz
 
-  macos-build:
+  macos-12-build:
     runs-on: macos-12
 
     env:
@@ -265,14 +265,16 @@ jobs:
         cd tlRender/src/tlRender-build
         tests/tltest/tltest
 
-  macos-arm-build:
-    runs-on: macos-14
+  macos-12-package:
+    runs-on: macos-12
 
     env:
+      CMAKE_CXX_STANDARD: 17
+      CMAKE_OSX_DEPLOYMENT_TARGET: 10.15
       TLRENDER_PYTHON: OFF
       TLRENDER_API: GL_4_1
       TLRENDER_GLFW: ON
-      TLRENDER_NET: OFF
+      TLRENDER_NET: ON
       TLRENDER_OCIO: ON
       TLRENDER_AUDIO: ON
       TLRENDER_JPEG: ON
@@ -281,15 +283,12 @@ jobs:
       TLRENDER_PNG: ON
       TLRENDER_EXR: ON
       TLRENDER_FFMPEG: ON
-      TLRENDER_USD: OFF
+      TLRENDER_USD: ON
       TLRENDER_NFD: OFF
       TLRENDER_QT5: OFF
       TLRENDER_PROGRAMS: ON
-      TLRENDER_EXAMPLES: ON
-      TLRENDER_TESTS: ON
-      TLRENDER_GCOV: OFF
-      CMAKE_OSX_DEPLOYMENT_TARGET: 14
-      CMAKE_OSX_ARCHITECTURES: arm64
+      TLRENDER_EXAMPLES: OFF
+      TLRENDER_TESTS: OFF
 
     steps:
     - uses: actions/checkout@v3
@@ -311,25 +310,27 @@ jobs:
     - name: Build tlRender
       run: |
         export DYLD_LIBRARY_PATH=$PWD/build/install/lib:$DYLD_LIBRARY_PATH
-        bash etc/macOS/macos-build-gha.sh Debug
+        bash etc/macOS/macos-build-gha.sh Release
 
-    - name: Run tests
+    - name: Package
       run: |
-        export DYLD_LIBRARY_PATH=$PWD/build/install/lib:$DYLD_LIBRARY_PATH
         cd build
         cd tlRender/src/tlRender-build
-        tests/tltest/tltest
+        cmake --build . -j 4 --target package
 
-  macos-package:
-    runs-on: macos-12
+    - uses: actions/upload-artifact@v3
+      with:
+        name: tlRender-macOS-Packages
+        path: build/tlRender/src/tlRender-build/tlRender-*.dmg
+
+  macos-14-build:
+    runs-on: macos-14
 
     env:
-      CMAKE_CXX_STANDARD: 17
-      CMAKE_OSX_DEPLOYMENT_TARGET: 10.15
       TLRENDER_PYTHON: OFF
       TLRENDER_API: GL_4_1
       TLRENDER_GLFW: ON
-      TLRENDER_NET: ON
+      TLRENDER_NET: OFF
       TLRENDER_OCIO: ON
       TLRENDER_AUDIO: ON
       TLRENDER_JPEG: ON
@@ -338,12 +339,15 @@ jobs:
       TLRENDER_PNG: ON
       TLRENDER_EXR: ON
       TLRENDER_FFMPEG: ON
-      TLRENDER_USD: ON
+      TLRENDER_USD: OFF
       TLRENDER_NFD: OFF
       TLRENDER_QT5: OFF
       TLRENDER_PROGRAMS: ON
-      TLRENDER_EXAMPLES: OFF
-      TLRENDER_TESTS: OFF
+      TLRENDER_EXAMPLES: ON
+      TLRENDER_TESTS: ON
+      TLRENDER_GCOV: OFF
+      CMAKE_OSX_DEPLOYMENT_TARGET: 14
+      CMAKE_OSX_ARCHITECTURES: arm64
 
     steps:
     - uses: actions/checkout@v3
@@ -365,18 +369,14 @@ jobs:
     - name: Build tlRender
       run: |
         export DYLD_LIBRARY_PATH=$PWD/build/install/lib:$DYLD_LIBRARY_PATH
-        bash etc/macOS/macos-build-gha.sh Release
+        bash etc/macOS/macos-build-gha.sh Debug
 
-    - name: Package
+    - name: Run tests
       run: |
+        export DYLD_LIBRARY_PATH=$PWD/build/install/lib:$DYLD_LIBRARY_PATH
         cd build
         cd tlRender/src/tlRender-build
-        cmake --build . -j 4 --target package
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: tlRender-macOS-Packages
-        path: build/tlRender/src/tlRender-build/tlRender-*.dmg
+        tests/tltest/tltest
 
   windows-build:
     runs-on: windows-latest