diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 459929e0..4dacc622 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -70,6 +70,8 @@ jobs: cibw-arch: macosx_x86_64 - runs-on: macos-latest cibw-arch: macosx_arm64 + - runs-on: macos-latest + cibw-arch: macosx_universal2 - runs-on: windows-latest cibw-arch: win_amd64 - runs-on: windows-latest @@ -102,11 +104,13 @@ jobs: shell: bash run: | CMAKE_ARCH="${{ matrix.cibw-arch == 'win32' && '-A Win32' || '' }}" + CMAKE_OSX_ARCHITECTURES=${{ matrix.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.cibw-arch == 'macosx_universal2' && '"arm64;x86_64"' || '' }} echo "CIBW_ARCHS_MACOS=x86_64 arm64 universal2" >> $GITHUB_ENV echo "CIBW_BUILD=*-${{ matrix.cibw-arch }}" >> $GITHUB_ENV CIBW_ENVIRONMENT_COMMON="PARSELMOUTH_EXTRA_CMAKE_ARGS=\"-DPREBUILT_DEPENDENCIES=\$(python -c 'import os; print(os.getcwd().replace(os.path.sep, '/'))')/build_dependencies\" CMAKE_BUILD_PARALLEL_LEVEL=2" echo "CIBW_ENVIRONMENT=$CIBW_ENVIRONMENT_COMMON" >> $GITHUB_ENV echo "CIBW_ENVIRONMENT_LINUX=$CIBW_ENVIRONMENT_COMMON PIP_ONLY_BINARY='numpy'" >> $GITHUB_ENV + echo "CIBW_ENVIRONMENT_MACOS=$CIBW_ENVIRONMENT_COMMON MACOSX_DEPLOYMENT_TARGET=10.9 CMAKE_OSX_ARCHITECTURES=\"$CMAKE_OSX_ARCHITECTURES\"" >> $GITHUB_ENV CIBW_BEFORE_ALL_COMMON="cmake -S . -B build_dependencies $CMAKE_ARCH && cmake --build build_dependencies --target praat -j 2" echo "CIBW_BEFORE_ALL=$CIBW_BEFORE_ALL_COMMON" >> $GITHUB_ENV echo "CIBW_BEFORE_ALL_LINUX=pip install cmake && ln -s \$(which cmake) /usr/local/bin/cmake && $CIBW_BEFORE_ALL_COMMON" >> $GITHUB_ENV diff --git a/pyproject.toml b/pyproject.toml index 2b6aeabc..cf569dc8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,6 +3,6 @@ requires = [ "setuptools>=42", "wheel", "cmake>=3.18", - "scikit_build @ git+https://github.com/YannickJadoul/scikit-build@vs2019", + "scikit_build @ git+https://github.com/YannickJadoul/scikit-build@vs2019-apple-silicon", ] build-backend = "setuptools.build_meta"