From 0305277538117dec6da96041018ba341c727306b Mon Sep 17 00:00:00 2001 From: Remo E Date: Fri, 29 Sep 2023 16:01:16 +0200 Subject: [PATCH] fix: gha macos build (#2341) * Update macos.yml macos-12 > macos-13 * gha: update cmake compiler settings * gha: disable osgearth tests. catch.hpp doesn't build --- .github/workflows/macos.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 92509f370a..70d5e2aa69 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,9 +13,9 @@ jobs: strategy: matrix: - os: ['macos-12'] + os: ['macos-13'] include: - - os: 'macos-12' + - os: 'macos-13' triplet: 'x64-macosx' steps: @@ -45,7 +45,7 @@ jobs: shell: bash working-directory: ${{ runner.workspace }}/build run: | - cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOSGEARTH_BUILD_LEGACY_SPLAT_NODEKIT=ON -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=ON -DCMAKE_CXX_STANDARD:STRING=14 -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON -DCMAKE_CXX_EXTENSIONS:BOOL=OFF -GXcode -DVCPKG_MANIFEST_DIR=$GITHUB_WORKSPACE/vcpkg + cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOSGEARTH_BUILD_TESTS=OFF -DOSGEARTH_BUILD_LEGACY_SPLAT_NODEKIT=ON -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=ON -DCMAKE_CXX_STANDARD:STRING=17 -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON -GXcode -DVCPKG_MANIFEST_DIR=$GITHUB_WORKSPACE/vcpkg - name: 'Upload cmake configure log artifact' uses: actions/upload-artifact@v2