Skip to content

Commit ab22ffa

Browse files
committed
Merge branch 'maintenance/generic-gha-cibuildwheel-resync'
2 parents 2bccb2a + 139f450 commit ab22ffa

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

.github/workflows/reusable-cibuildwheel.yml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
---
22

3-
name: Build wheel
3+
name: >-
4+
5+
[DO NOT CLICK]
6+
Reusable cibuildwheel
47
58
on: # yamllint disable-line rule:truthy
69
workflow_call:
710
inputs:
8-
dists-artifact-name:
9-
description: Workflow artifact name containing dists
10-
required: true
11-
type: string
1211
check-name:
1312
description: A custom name for the Checks API-reported status
1413
required: false
1514
type: string
15+
dists-artifact-name:
16+
description: >-
17+
Workflow artifact name containing dists.
18+
Defaults to "python-package-distributions".
19+
default: python-package-distributions
20+
required: false
21+
type: string
1622
environment-variables:
1723
description: >-
1824
A newline-delimited blob of text with environment variables
@@ -32,8 +38,10 @@ on: # yamllint disable-line rule:truthy
3238
required: false
3339
type: string
3440
source-tarball-name:
35-
description: Sdist filename wildcard
36-
required: true
41+
default: >-
42+
*.tar.gz
43+
description: Sdist filename wildcard. Defaults to "*.tar.gz".
44+
required: false
3745
type: string
3846
timeout-minutes:
3947
description: Deadline for the job to complete
@@ -87,11 +95,11 @@ jobs:
8795
print(f'hash={hash}', file=outputs_file)
8896
shell: python
8997

90-
- name: Retrieve the project source from an sdist inside the GHA artifact
91-
uses: re-actors/checkout-python-sdist@release/v2
98+
- name: Download the source distribution
99+
uses: actions/download-artifact@v4
92100
with:
93-
source-tarball-name: ${{ inputs.source-tarball-name }}
94-
workflow-artifact-name: ${{ inputs.dists-artifact-name }}
101+
name: ${{ inputs.dists-artifact-name }}
102+
path: dist/
95103

96104
- name: Set up QEMU
97105
if: inputs.qemu
@@ -101,6 +109,9 @@ jobs:
101109

102110
- name: Build wheels
103111
uses: pypa/[email protected]
112+
with:
113+
package-dir: >- # not necessarily a dir, we pass an acceptable sdist
114+
dist/${{ inputs.source-tarball-name }}
104115
105116
- name: Upload built artifacts for testing and publishing
106117
uses: actions/upload-artifact@v4

CHANGES/1536.contrib.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
When building wheels, the source distribution is now passed directly
2+
to the ``cibuildwheel`` invocation -- by :user:`webknjaz`.

0 commit comments

Comments
 (0)