Skip to content

Commit c9cd7fb

Browse files
committed
💅 Move whl name lookup to dedicated GHA job step
1 parent 772528e commit c9cd7fb

File tree

1 file changed

+24
-14
lines changed

1 file changed

+24
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ jobs:
265265
if: ${{ ! contains(matrix.spec, 'x86_64') }}
266266

267267
- name: build/test wheels
268-
id: build
269268
env:
270269
CFLAGS: -Dffi_call=cffistatic_ffi_call # override name for ffi_call to break hard if we linked against someone else's libffi
271270
CIBW_ARCHS_LINUX: all
@@ -302,13 +301,18 @@ jobs:
302301
# actually build libffi + wheel (using env tweaks above)
303302
python -m cibuildwheel --output-dir dist ./cffi
304303
305-
echo "artifact_name=$(ls ./dist/)" >> "$GITHUB_OUTPUT"
304+
shell: bash
305+
306+
- name: determine built wheel filename
307+
id: built-artifact-lookup
308+
run: echo "artifact_name=$(ls ./dist/)" >> "${GITHUB_OUTPUT}"
309+
shell: bash -eEuxo pipefail {0}
306310

307311
- name: upload artifacts
308312
uses: actions/upload-artifact@v4
309313
with:
310-
name: ${{ steps.build.outputs.artifact_name }}
311-
path: dist/*.whl
314+
name: ${{ steps.built-artifact-lookup.outputs.artifact_name }}
315+
path: dist/${{ steps.built-artifact-lookup.outputs.artifact_name }}
312316
if-no-files-found: error
313317
if: ${{ env.skip_artifact_upload != 'true' }}
314318

@@ -404,7 +408,6 @@ jobs:
404408
brew uninstall --ignore-dependencies libffi 2>&1 || true
405409
406410
- name: build/test wheels
407-
id: build
408411
env:
409412
CIBW_BUILD: ${{ matrix.spec }}
410413
CIBW_PRERELEASE_PYTHONS: 'True'
@@ -420,14 +423,19 @@ jobs:
420423
tar zxf ${{ steps.fetch_sdist.outputs.download-path }}/cffi*.tar.gz/cffi*.tar.gz --strip-components=1 -C cffi
421424
422425
python3 -m cibuildwheel --output-dir dist cffi
423-
424-
echo "artifact_name=$(ls ./dist/)" >> "$GITHUB_OUTPUT"
426+
427+
shell: bash
428+
429+
- name: determine built wheel filename
430+
id: built-artifact-lookup
431+
run: echo "artifact_name=$(ls ./dist/)" >> "${GITHUB_OUTPUT}"
432+
shell: bash -eEuxo pipefail {0}
425433

426434
- name: upload artifacts
427435
uses: actions/upload-artifact@v4
428436
with:
429-
name: ${{ steps.build.outputs.artifact_name }}
430-
path: dist/*.whl
437+
name: ${{ steps.built-artifact-lookup.outputs.artifact_name }}
438+
path: dist/${{ steps.built-artifact-lookup.outputs.artifact_name }}
431439
if-no-files-found: error
432440
if: ${{ env.skip_artifact_upload != 'true' }}
433441

@@ -495,7 +503,6 @@ jobs:
495503
name: ${{ needs.build_sdist.outputs.artifact_name }}
496504

497505
- name: build/test wheels
498-
id: build
499506
env:
500507
CIBW_BUILD: ${{ matrix.spec }}
501508
CIBW_PRERELEASE_PYTHONS: 'True'
@@ -513,16 +520,19 @@ jobs:
513520
python -m pip install --upgrade pip
514521
pip install "${{ matrix.cibw_version || 'cibuildwheel'}}"
515522
python -m cibuildwheel --output-dir dist cffi
516-
517-
echo "artifact_name=$(ls ./dist/)" >> "$GITHUB_OUTPUT"
518523
519524
shell: bash
520525

526+
- name: determine built wheel filename
527+
id: built-artifact-lookup
528+
run: echo "artifact_name=$(ls ./dist/)" >> "${GITHUB_OUTPUT}"
529+
shell: bash -eEuxo pipefail {0}
530+
521531
- name: upload artifacts
522532
uses: actions/upload-artifact@v4
523533
with:
524-
name: ${{ steps.build.outputs.artifact_name }}
525-
path: dist/*.whl
534+
name: ${{ steps.built-artifact-lookup.outputs.artifact_name }}
535+
path: dist/${{ steps.built-artifact-lookup.outputs.artifact_name }}
526536
if-no-files-found: error
527537
if: ${{ env.skip_artifact_upload != 'true' }}
528538

0 commit comments

Comments
 (0)