Skip to content

Commit

Permalink
ci: update to macos-14
Browse files Browse the repository at this point in the history
this should give us xcode 16, with better c++20 support (e.g. 3-way comparison on std::optional)
  • Loading branch information
ericwa committed Jan 2, 2025
1 parent 4c1d4af commit a6c7a18
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-building.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
os:
- ubuntu-22.04
- ubuntu-24.04
- macos-13
- macos-14
- windows-2022
use-asan:
- YES
Expand Down
4 changes: 2 additions & 2 deletions build-osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ TBB_CMAKE_DIR="$(pwd)/${TBB_DIR_NAME}/lib/cmake"

# check USE_ASAN environment variable (see cmake.yml)
if [ "$USE_ASAN" == "YES" ]; then
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DCMAKE_OSX_ARCHITECTURES=x86_64 -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES
else
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR"
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DCMAKE_OSX_ARCHITECTURES=x86_64
fi
make -j8 package || exit 1

Expand Down

0 comments on commit a6c7a18

Please sign in to comment.