Skip to content

Commit 4c7b02b

Browse files
committed
Fall back to older macos test runners
Yikes. manifold 2 uses thrust, which uses cuda headers (even when not building with cuda support) and the cuda headers have their own copies of libc++ headers - which conflict big time when trying to build with newer xcode. See if the older github runner has a toolchain we can use - if 14 doens't work we can try falling back to 13, but if neither of them can do it we'll just have to disable osx for this release - updating manifold v2 to be compatible is much too large a lift, and bumping to v3 (alread done in main) is NOT patch release material - the 2->3 shift was significant behaviorially.
1 parent 1ddd1e3 commit 4c7b02b

4 files changed

Lines changed: 2 additions & 31 deletions

File tree

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ jobs:
248248
249249
osx_release:
250250
name: macOS Clang Release Build
251-
runs-on: macos-latest
251+
runs-on: macos-14
252252
strategy:
253253
fail-fast: true
254254
steps:
@@ -276,7 +276,7 @@ jobs:
276276
277277
osx_debug:
278278
name: macOS Clang Debug Build
279-
runs-on: macos-latest
279+
runs-on: macos-14
280280
strategy:
281281
fail-fast: true
282282
steps:

manifold/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ if (ENABLE_MANIFOLD)
1414
ExternalProject_Add(MANIFOLD_BLD
1515
URL "${CMAKE_CURRENT_SOURCE_DIR}/manifold"
1616
BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
17-
PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/thrust.patch
18-
COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/cuda.patch
1917
CMAKE_ARGS
2018
${BUILD_TYPE_SPECIFIER}
2119
$<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
@@ -31,8 +29,6 @@ if (ENABLE_MANIFOLD)
3129
-DCMAKE_INSTALL_LIBDIR:PATH=${LIB_DIR}
3230
-DCMAKE_INSTALL_RPATH=${CMAKE_BUNDLE_INSTALL_PREFIX}/${LIB_DIR}
3331
-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
34-
-DTHRUST_DEVICE_SYSTEM=CPP
35-
-DTHRUST_HOST_SYSTEM=CPP
3632
LOG_CONFIGURE ${EXT_BUILD_QUIET}
3733
LOG_BUILD ${EXT_BUILD_QUIET}
3834
LOG_INSTALL ${EXT_BUILD_QUIET}

manifold/cuda.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

manifold/thrust.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)