diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4a1b275..e1f43644 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,15 +48,30 @@ jobs: needs: [build_data] strategy: matrix: - os: [ubuntu-latest, windows-latest] include: - os: ubuntu-latest + arch: x86_64 + before_all: >- + echo "Starting BEFORE_ALL script" && + echo "GEOS_DIR set to: ${GEOS_DIR}" && + cd "{package}" && + python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)" + - os: macos-13 + arch: x86_64 + before_all: >- + echo "Starting BEFORE_ALL script" && + echo "GEOS_DIR set to: ${GEOS_DIR}" && + cd "{package}" && + python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)" + - os: macos-14 + arch: arm64 before_all: >- echo "Starting BEFORE_ALL script" && echo "GEOS_DIR set to: ${GEOS_DIR}" && cd "{package}" && python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)" - os: windows-latest + arch: x86_64 before_all: >- echo Starting BEFORE_ALL script && echo GEOS_DIR set to: %GEOS_DIR% && @@ -83,7 +98,8 @@ jobs: env: CIBW_BUILD_VERBOSITY: 1 CIBW_BUILD: "cp39* cp310* cp311* cp312* cp313*" - CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l" + CIBW_ARCHS_MACOS: ${{ matrix.arch }} + CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-linux_aarch64 *-linux_armv7l" CIBW_BEFORE_ALL: ${{ matrix.before_all }} CIBW_TEST_EXTRAS: "test" CIBW_TEST_COMMAND: "python -m pytest {project}/packages/basemap" @@ -93,7 +109,8 @@ jobs: PIP_PREFER_BINARY=1 PYTHONUNBUFFERED=1 LD_LIBRARY_PATH="${GEOS_DIR}/lib" - # LD_LIBRARY_PATH in environment is needed by auditwheel (Linux). + # LD_LIBRARY_PATH in environment is needed by + # auditwheel (Linux) and delocate (MacOS). with: package-dir: "packages/basemap" output-dir: "packages/basemap/dist"