From 961982b5801a8075e4eab882b97ef051c3ec58b3 Mon Sep 17 00:00:00 2001 From: Alex Ciobanu Date: Wed, 28 Feb 2024 15:29:52 -0500 Subject: [PATCH 1/3] Adding back support for arm64 macOS builds. By running the build task on an arm64 runner we get wheels that include the dependency libraries (libfreetype, and libpng). --- .github/workflows/ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7986eae..6d1b73d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,9 @@ jobs: - os: windows-2019 cibw_archs: "AMD64 ARM64" - os: macos-11 - cibw_archs: "x86_64" # arm64" # No freetype on non-native platforms + cibw_archs: "x86_64" + - os: macos-14 # The macos-14 runner is arm64, while up until macos-13 the runners are x86_64. + cibw_archs: "arm64" - os: "ubuntu-20.04" cibw_archs: "aarch64" - os: "ubuntu-20.04" @@ -54,6 +56,13 @@ jobs: with: platforms: all + # See discussion here: https://github.com/actions/runner-images/issues/9256 + - name: Maker sure pipx is installed for the arm64 macOS runners. + if: runner.os == 'macOS' && runner.arch == 'ARM64' + run: | + brew install pipx + pipx ensurepath + - name: Build wheels uses: pypa/cibuildwheel@v2.16.2 env: From 126cbc65b1b7c4c240954a3cc69d4e6e45f32f62 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Tue, 5 Mar 2024 11:07:16 -0600 Subject: [PATCH 2/3] Update .github/workflows/ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d1b73d..af52892 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: platforms: all # See discussion here: https://github.com/actions/runner-images/issues/9256 - - name: Maker sure pipx is installed for the arm64 macOS runners. + - name: Make sure pipx is installed for the arm64 macOS runners. if: runner.os == 'macOS' && runner.arch == 'ARM64' run: | brew install pipx From 8bf4e33da3e8b4c75fd89a6f0e84cfdb4f0b73b0 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Tue, 5 Mar 2024 12:48:19 -0600 Subject: [PATCH 3/3] Update cibuildwheel in ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af52892..0fa2ddd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: pipx ensurepath - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_TEST_COMMAND: python {project}/selftest.py CIBW_BEFORE_BUILD_LINUX: yum install -y freetype-devel