From e013ad96213fe566411ad2655b3072428574deb9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 16 Nov 2023 09:22:23 +1100 Subject: [PATCH] Restored MACOSX_DEPLOYMENT_TARGET on x86_64 --- .github/workflows/wheels-dependencies.sh | 4 ---- .github/workflows/wheels.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index a5a3aa9730d..410941c6e0c 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -144,10 +144,6 @@ if [[ -n "$IS_MACOS" ]]; then brew remove --ignore-dependencies webp zstd xz libpng libtiff libxcb libxdmcp curl php cairo lcms2 ghostscript brew install pkg-config - - if [[ "$CIBW_ARCHS" != "arm64" ]]; then - export MACOSX_DEPLOYMENT_TARGET="10.10" - fi fi wrap_wheel_builder build diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6bb23a250b8..89b1c7b6aee 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -34,9 +34,11 @@ jobs: - name: "macOS x86_64" os: macos-latest archs: x86_64 + macosx_deployment_target: "10.10" - name: "macOS arm64" os: macos-latest archs: arm64 + macosx_deployment_target: "11.0" - name: "manylinux2014 and musllinux x86_64" os: ubuntu-latest archs: x86_64 @@ -61,6 +63,7 @@ jobs: CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_TEST_SKIP: "*-macosx_arm64" + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }} - uses: actions/upload-artifact@v3 with: