From 95460cf5bd18caa12a4bc7e682622d01e6984b66 Mon Sep 17 00:00:00 2001
From: Just van Rossum <justvanrossum@gmail.com>
Date: Thu, 30 Jan 2025 17:31:42 +0100
Subject: [PATCH 1/3] drop build_aarch64_wheels job in favor of
ubuntu-24.04-arm os
---
.github/workflows/wheels.yml | 44 ++++++++----------------------------
1 file changed, 10 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 7808ef7..0b75cb8 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -18,9 +18,16 @@ jobs:
# macos-13 runners are still x86_64, macos-14 (latest) are arm64; we want to build
# the x86_64 wheel on/for x86_64 macs
os: [ "ubuntu-latest", "windows-latest", "macos-13" ]
+ arch: [auto64]
+ include:
+ - os: macos-latest
+ arch: universal2
+ - os: windows-latest
+ arch: auto32
+ - os: ubuntu-24.04-arm
+ arch: aarch64
env:
- CIBW_ARCHS: auto64
- CIBW_ARCHS_MACOS: "x86_64 universal2"
+ CIBW_ARCHS: ${{ matrix.arch }}
# Skip
#
# * Python 3.6 and 3.7 on all platforms,
@@ -43,42 +50,11 @@ jobs:
name: wheels-${{ matrix.os }}
path: dist/*.whl
- build_aarch64_wheels:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- # aarch64 uses qemu so it's slow, build each py version in parallel jobs
- python: [38, 39, 310, 311, 312, 313]
- arch: [aarch64]
- env:
- # Skip building aarch64 wheels for musllinux until someone ask...
- CIBW_SKIP: "*-musllinux*"
- CIBW_BUILD: cp${{ matrix.python }}-*
- CIBW_ARCHS: ${{ matrix.arch }}
- steps:
- - uses: actions/checkout@v4
- with:
- submodules: recursive
- - uses: docker/setup-qemu-action@v3.3.0
- with:
- # temporarily pin to qemu@v8 to workaround non-determininstic gcc segfaults
- # https://github.com/docker/setup-qemu-action/issues/188
- image: tonistiigi/binfmt:qemu-v8.1.5
- platforms: all
- - name: Install dependencies
- run: pip install cibuildwheel
- - name: Build and Test Wheels
- run: python -m cibuildwheel --output-dir dist
- - uses: actions/upload-artifact@v4
- with:
- name: wheels-${{ matrix.python }}-linux-${{ matrix.arch }}
- path: dist/*.whl
-
deploy:
# only run if the commit is tagged...
if: startsWith(github.ref, 'refs/tags/v')
# ... and all build jobs completed successfully
- needs: [build_wheels, build_aarch64_wheels]
+ needs: [build_wheels]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
From b17bf703f21fca121837e142972a91a2251dec80 Mon Sep 17 00:00:00 2001
From: Just van Rossum <justvanrossum@gmail.com>
Date: Thu, 30 Jan 2025 17:44:59 +0100
Subject: [PATCH 2/3] Fix wheel name
---
.github/workflows/wheels.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 0b75cb8..9058b2c 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -47,7 +47,7 @@ jobs:
run: python -m cibuildwheel --output-dir dist
- uses: actions/upload-artifact@v4
with:
- name: wheels-${{ matrix.os }}
+ name: wheels-${{ matrix.os }}-${{ matrix.arch }}
path: dist/*.whl
deploy:
From 2839ff1c74357ab0d90148b743e1d80494bcf10d Mon Sep 17 00:00:00 2001
From: Just van Rossum <justvanrossum@gmail.com>
Date: Thu, 30 Jan 2025 17:53:16 +0100
Subject: [PATCH 3/3] Hm, perhaps no need for 32 bit Win
---
.github/workflows/wheels.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 9058b2c..8278d46 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -22,8 +22,6 @@ jobs:
include:
- os: macos-latest
arch: universal2
- - os: windows-latest
- arch: auto32
- os: ubuntu-24.04-arm
arch: aarch64
env: