diff --git a/.github/workflows/buildwheels.yml b/.github/workflows/buildwheels.yml index 2d305e3..4ed4a06 100644 --- a/.github/workflows/buildwheels.yml +++ b/.github/workflows/buildwheels.yml @@ -9,7 +9,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-12, macos-14] + # macos-13 is an intel runner, macos-14 is apple silicon + os: [ubuntu-latest, macos-13, macos-14] steps: - uses: actions/checkout@v4 @@ -24,7 +25,13 @@ jobs: with: platforms: all + - name: Set MACOSX_DEPLOYMENT_TARGET dynamically from the runner + if: runner.os == 'macOS' + run: echo "MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | cut -d. -f1,2)" >> $GITHUB_ENV + - name: Build wheels + env: + CIBW_ENVIRONMENT: MACOSX_DEPLOYMENT_TARGET=${{ env.MACOSX_DEPLOYMENT_TARGET }} uses: pypa/cibuildwheel@v2.20.0 - uses: actions/upload-artifact@v3 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 228da1b..759d665 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,6 +2,8 @@ name: Build and upload to PyPI on: workflow_dispatch: + release: + types: [published] jobs: build_wheels: @@ -26,6 +28,8 @@ jobs: platforms: all - name: Build wheels + env: + CIBW_ENVIRONMENT: MACOSX_DEPLOYMENT_TARGET=11 uses: pypa/cibuildwheel@v2.20.0 - uses: actions/upload-artifact@v3 diff --git a/pyproject.toml b/pyproject.toml index aab10a6..07bb5ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,5 +78,6 @@ before-all = "yum install -y gcc make zlib-devel openssl-devel libpng-devel" [tool.cibuildwheel.macos] archs = ["auto"] # "arm64" needs M1 runner on GitHub Actions before-all = """ +export MACOSX_DEPLOYMENT_TARGET=${sw_vers -productVersion | cut -d. -f1} brew install pkg-config openssl libpng # -> /usr/local (x86_64) """