Merge pull request #998 from CesiumGS/macos-15

Run build on macos-15 instead of macos-12.
CesiumGS · Nov 19, 2024 · 9047047 · 9047047
2 parents 8d1bea8 + b9667ff
commit 9047047
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -76,13 +76,13 @@ jobs:
       fail-fast: false
       matrix:
         compiler: [ gcc, clang ]
-        platform: [ ubuntu-22.04, ubuntu-20.04, macos-12 ]
+        platform: [ ubuntu-22.04, ubuntu-20.04, macos-15 ]
         build_type: [Debug, RelWithDebInfo]
         exclude:
           - compiler: clang
-            platform: ubuntu-22.04	
+            platform: ubuntu-22.04
           - compiler: gcc
-            platform: macos-12
+            platform: macos-15
           - compiler: gcc
             platform: ubuntu-20.04
     name: "${{matrix.platform}} / ${{matrix.compiler}} / ${{matrix.build_type}}"
@@ -111,13 +111,17 @@ jobs:
             vcpkg-${{ env.CACHE_KEY }}-${{ hashFiles('CMakeLists.txt') }}
             vcpkg-${{ env.CACHE_KEY }}
       - name: Set CC and CXX
-        if: ${{ matrix.compiler == 'clang' && matrix.platform != 'macos-12'}}
+        if: ${{ matrix.compiler == 'clang' && matrix.platform != 'macos-15'}}
         run: |
           echo "CC=clang-12" >> "$GITHUB_ENV"
           echo "CXX=clang++-12" >> "$GITHUB_ENV"
+      - name: Set macOS cmake options
+        if: ${{ matrix.platform == 'macos-15' }}
+        run: |
+          echo "EXTRA_CMAKE_OPTIONS=-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=x86_64" >> "$GITHUB_ENV"
       - name: Compile ${{matrix.build_type}} Configuration
         run: |
-          cmake -B build -S . -DCMAKE_BUILD_TYPE:STRING=${{matrix.build_type}}
+          cmake -B build -S . -DCMAKE_BUILD_TYPE:STRING=${{matrix.build_type}} $EXTRA_CMAKE_OPTIONS
           cmake --build build --parallel
       - name: Test ${{matrix.build_type}} Configuration
         run: |