Skip to content

Commit

Permalink
fix: gha macos build (#2341)
Browse files Browse the repository at this point in the history
* Update macos.yml macos-12 > macos-13

* gha: update cmake compiler settings

* gha: disable osgearth tests. catch.hpp doesn't build
  • Loading branch information
remoe authored Sep 29, 2023
1 parent 27ad254 commit 0305277
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:

strategy:
matrix:
os: ['macos-12']
os: ['macos-13']
include:
- os: 'macos-12'
- os: 'macos-13'
triplet: 'x64-macosx'

steps:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0305277

Please sign in to comment.