From 1258db1744913b66e191b8db6ef394b14ce85f62 Mon Sep 17 00:00:00 2001 From: Zach Lewis Date: Wed, 18 Sep 2024 15:59:33 -0400 Subject: [PATCH] ci(wheels): Use macos-14 runners for linux arm builds; use latest cibw The aarch64 wheels are currently failing , and they take forever to build. Moving the aarch64 wheels builds to the MacOS M1 runners will hopefully fix both problems at once, provided these mac runners have a docker engine installed... Signed-off-by: Zach Lewis --- .github/workflows/wheel.yml | 71 +++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index e1eeb8898b..4b8e12cff0 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -123,29 +123,7 @@ jobs: manylinux: manylinux2014 python: cp312-manylinux_x86_64 arch: x86_64 - # ------------------------------------------------------------------- - # CPython ARM 64 bits manylinux2014 - # ------------------------------------------------------------------- - - build: CPython 3.8 ARM 64 bits manylinux2014 - manylinux: manylinux2014 - python: cp38-manylinux_aarch64 - arch: aarch64 - - build: CPython 3.9 ARM 64 bits manylinux2014 - manylinux: manylinux2014 - python: cp39-manylinux_aarch64 - arch: aarch64 - - build: CPython 3.10 ARM 64 bits manylinux2014 - manylinux: manylinux2014 - python: cp310-manylinux_aarch64 - arch: aarch64 - - build: CPython 3.11 ARM 64 bits manylinux2014 - manylinux: manylinux2014 - python: cp311-manylinux_aarch64 - arch: aarch64 - - build: CPython 3.12 ARM 64 bits manylinux2014 - manylinux: manylinux2014 - python: cp312-manylinux_aarch64 - arch: aarch64 + steps: - uses: actions/checkout@v4 @@ -161,12 +139,11 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.21.1 env: CIBW_BUILD: ${{ matrix.python }} CIBW_ARCHS: ${{ matrix.arch }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }} - CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.manylinux }} - uses: actions/upload-artifact@v4 with: @@ -216,7 +193,7 @@ jobs: python-version: '3.8' - name: Build wheels - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.21.1 env: CIBW_BUILD: ${{ matrix.python }} CIBW_ARCHS: ${{ matrix.arch }} @@ -242,19 +219,42 @@ jobs: # ------------------------------------------------------------------- - build: CPython 3.8 ARM 64 bits python: cp38-macosx_arm64 - arch: arm64 + arch: auto - build: CPython 3.9 ARM 64 bits python: cp39-macosx_arm64 - arch: arm64 + arch: auto - build: CPython 3.10 ARM 64 bits python: cp310-macosx_arm64 - arch: arm64 + arch: auto - build: CPython 3.11 ARM 64 bits python: cp311-macosx_arm64 - arch: arm64 + arch: auto - build: CPython 3.12 ARM 64 bits python: cp312-macosx_arm64 - arch: arm64 + arch: auto + # ------------------------------------------------------------------- + # CPython ARM 64 bits manylinux2014 + # ------------------------------------------------------------------- + - build: CPython 3.8 ARM 64 bits manylinux2014 + manylinux: manylinux2014 + python: cp38-manylinux_aarch64 + arch: aarch64 + - build: CPython 3.9 ARM 64 bits manylinux2014 + manylinux: manylinux2014 + python: cp39-manylinux_aarch64 + arch: aarch64 + - build: CPython 3.10 ARM 64 bits manylinux2014 + manylinux: manylinux2014 + python: cp310-manylinux_aarch64 + arch: aarch64 + - build: CPython 3.11 ARM 64 bits manylinux2014 + manylinux: manylinux2014 + python: cp311-manylinux_aarch64 + arch: aarch64 + - build: CPython 3.12 ARM 64 bits manylinux2014 + manylinux: manylinux2014 + python: cp312-manylinux_aarch64 + arch: aarch64 steps: - uses: actions/checkout@v4 @@ -265,10 +265,13 @@ jobs: python-version: '3.8' - name: Build wheels - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.21.1 env: CIBW_BUILD: ${{ matrix.python }} - CIBW_ARCHS: ${{ matrix.arch }} + #CIBW_ARCHS: ${{ matrix.arch }} + #CIBW_ARCHS_MACOS: ${{ matrix.arch }} + CIBW_ARCHS_LINUX: ${{ matrix.arch }} + CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.manylinux }} - uses: actions/upload-artifact@v4 with: @@ -318,7 +321,7 @@ jobs: python-version: '3.8' - name: Build wheels - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.21.1 env: CIBW_BUILD: ${{ matrix.python }} CIBW_ARCHS: ${{ matrix.arch }}