@@ -51,14 +51,23 @@ jobs:
5151 os : [ubuntu-latest, windows-latest, macos-latest]
5252 include :
5353 - os : ubuntu-latest
54+ arch : x86_64
5455 before_all : >-
5556 echo "Starting BEFORE_ALL script" &&
5657 echo "GEOS_DIR set to: ${GEOS_DIR}" &&
5758 cd "{package}" &&
5859 python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
59- - os : macos-latest
60+ - os : macos-13:
6061 before_all : >-
62+ LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
63+ DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
6164 ARCHFLAGS="-arch x86_64 -arch arm64"
65+ echo "Starting BEFORE_ALL script" &&
66+ echo "GEOS_DIR set to: ${GEOS_DIR}" &&
67+ cd "{package}" &&
68+ python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
69+ - os : macos-latest
70+ before_all : >-
6271 LD_LIBRARY_PATH="${GEOS_DIR}/lib:$LD_LIBRARY_PATH"
6372 DYLD_FALLBACK_LIBRARY_PATH="${GEOS_DIR}/lib:$DYLD_FALLBACK_LIBRARY_PATH"
6473 ARCHFLAGS="-arch x86_64 -arch arm64"
6776 cd "{package}" &&
6877 python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
6978 - os : windows-latest
79+ arch : x86_64
7080 before_all : >-
7181 echo Starting BEFORE_ALL script &&
7282 echo GEOS_DIR set to: %GEOS_DIR% &&
93103 env :
94104 CIBW_BUILD_VERBOSITY : 1
95105 CIBW_BUILD : " cp39* cp310* cp311* cp312* cp313*"
96- CIBW_ARCHS_MACOS : " x86_64 arm64 "
106+ CIBW_ARCHS_MACOS : ${{ matrix.arch }}
97107 CIBW_SKIP : " pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-linux_aarch64 *-linux_armv7l"
98108 CIBW_BEFORE_ALL : ${{ matrix.before_all }}
99109 CIBW_TEST_EXTRAS : " test"
0 commit comments