From 7e374f76ba981f6d9fd5a4e9214a85668e557b65 Mon Sep 17 00:00:00 2001 From: Nils Homer Date: Fri, 17 Jan 2025 01:12:54 -0700 Subject: [PATCH] ci: fix download collision issue with cibuildwheen The cibuildwheel for macos for both arm64 and x86_64 create wheel artifacts named the same (e.g. pybwa-1.0.3-cp311-cp311-macosx_14_0_arm64.whl). The upload/artifact step then uses the correct name when it uploads, but it zips it up first, so when you unzip the macos artifacts for the two architecture, they'll have the same name. See: https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64 See: https://github.com/pypa/cibuildwheel/issues/2080 --- .github/workflows/wheels.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6d014ca..0eba0f1 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -40,9 +40,14 @@ jobs: with: submodules: "true" + - uses: actions/setup-python@v5 + if: runner.os != 'macOS' || runner.arch != 'ARM64' + + # See: https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64 - uses: actions/setup-python@v5 with: python-version: 3.8 + if: runner.os == 'macOS' && runner.arch == 'ARM64' - name: Install cibuildwheel run: python -m pip install cibuildwheel==2.15.0