Skip to content

Commit ef0d060

Browse files
committed
Extra step to merge wheels
1 parent 4b5c9bd commit ef0d060

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.github/workflows/wheels.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727

2828
- uses: actions/upload-artifact@v4
2929
with:
30+
name: dist-sdist
3031
path: dist/*.tar.gz
3132

3233

@@ -55,10 +56,20 @@ jobs:
5556
path: wheelhouse/*.whl
5657
name: dist-${{ matrix.os }}
5758

59+
merge_wheels:
60+
name: Merge wheels into a combined artifact
61+
runs-on: ubuntu-latest
62+
needs: [build_wheels, build_sdist]
63+
steps:
64+
- name: Merge Artifacts
65+
uses: actions/upload-artifact/merge@v4
66+
with:
67+
name: dist
68+
pattern: dist-*
5869

5970
upload_all:
6071
name: Upload if release
61-
needs: [build_wheels, build_sdist]
72+
needs: merge_wheels
6273
runs-on: ubuntu-latest
6374
if: github.event_name == 'release' && github.event.action == 'published'
6475

@@ -67,8 +78,6 @@ jobs:
6778

6879
- uses: actions/download-artifact@v4
6980
with:
70-
merge-multiple: true
71-
pattern: dist-*
7281
path: dist
7382

7483
- uses: pypa/gh-action-pypi-publish@release/v1

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ build-dir = "build/{wheel_tag}"
2929
# Build stable ABI wheels for CPython 3.12+
3030
wheel.py-api = "cp312"
3131

32-
3332
[tool.cibuildwheel]
3433
# Necessary to see build output from the actual compilation
3534
build-verbosity = 1
@@ -38,7 +37,9 @@ build-verbosity = 1
3837
test-command = "pytest {project}/tests"
3938
test-requires = "pytest"
4039

40+
# Don't generate a Python 3.8 wheel on macOS/arm64
41+
skip="cp38-macosx_*:arm64"
42+
4143
# Needed for full C++17 support
4244
[tool.cibuildwheel.macos.environment]
4345
MACOSX_DEPLOYMENT_TARGET = "10.14"
44-

0 commit comments

Comments
 (0)