Skip to content

Commit 9ebb1f6

Browse files
zaniebotzanieb
andauthored
Clarify release pipeline job names (#21561)
The release workflow's job IDs still describe the old build, signing, and hosting stages even though they now produce complete release artifacts. Rename them to `build-release-artifacts`, `assemble-release-artifacts`, `generate-local-dist-manifest`, `build-global-dist-artifacts`, and `finalize-dist-manifest`, and update the matching CI caller. Workflow paths, release gates, and publication behavior remain unchanged. Co-authored-by: Zanie Blue <[email protected]>
1 parent d87450d commit 9ebb1f6

2 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
with:
141141
sha: ${{ github.sha }}
142142

143-
build-release-binaries:
143+
build-release-artifacts:
144144
needs: plan
145145
if: ${{ needs.plan.outputs.build-release-binaries == 'true' }}
146146
uses: $/.github/workflows/build-release-binaries.yml

‎.github/workflows/release.yml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
name: dist-manifest-plan-${{ github.run_id }}-${{ github.run_attempt }}
110110
path: plan-dist-manifest.json
111111

112-
build-release-binaries:
112+
build-release-artifacts:
113113
needs:
114114
- plan
115115
if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' || inputs.tag == 'dry-run' }}
@@ -132,10 +132,10 @@ jobs:
132132
"contents": "read"
133133
"id-token": "write"
134134

135-
sign-release-binaries:
135+
assemble-release-artifacts:
136136
needs:
137137
- plan
138-
- build-release-binaries
138+
- build-release-artifacts
139139
- release-gate
140140
if: ${{ github.repository == 'astral-sh/uv' && github.ref == 'refs/heads/main' }}
141141
uses: $/.github/workflows/sign-release-binaries.yml
@@ -146,11 +146,11 @@ jobs:
146146
contents: read
147147
id-token: write
148148

149-
generate-checksum-manifest:
149+
generate-local-dist-manifest:
150150
needs:
151151
- plan
152-
- build-release-binaries
153-
- sign-release-binaries
152+
- build-release-artifacts
153+
- assemble-release-artifacts
154154
if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' || inputs.tag == 'dry-run' }}
155155
runs-on: "depot-ubuntu-latest-4"
156156
outputs:
@@ -167,7 +167,7 @@ jobs:
167167
- name: Fetch release archives and plan
168168
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
169169
with:
170-
artifact-ids: ${{ needs.plan.outputs.artifact }},${{ needs.sign-release-binaries.outputs.github-archives }}
170+
artifact-ids: ${{ needs.plan.outputs.artifact }},${{ needs.assemble-release-artifacts.outputs.github-archives }}
171171
path: target/distrib/
172172
merge-multiple: true
173173
- name: Generate local dist manifest
@@ -191,12 +191,12 @@ jobs:
191191
path: target/distrib/local-dist-manifest.json
192192

193193
# Build and package all the platform-agnostic(ish) things
194-
build-global-artifacts:
194+
build-global-dist-artifacts:
195195
needs:
196196
- plan
197-
- build-release-binaries
198-
- generate-checksum-manifest
199-
- sign-release-binaries
197+
- build-release-artifacts
198+
- generate-local-dist-manifest
199+
- assemble-release-artifacts
200200
runs-on: "depot-ubuntu-latest-4"
201201
outputs:
202202
artifacts: ${{ steps.artifacts.outputs.artifact-id }}
@@ -216,7 +216,7 @@ jobs:
216216
- name: Fetch release archives and manifests
217217
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
218218
with:
219-
artifact-ids: ${{ needs.plan.outputs.artifact }},${{ needs.generate-checksum-manifest.outputs.artifact }},${{ needs.sign-release-binaries.outputs.github-archives }}
219+
artifact-ids: ${{ needs.plan.outputs.artifact }},${{ needs.generate-local-dist-manifest.outputs.artifact }},${{ needs.assemble-release-artifacts.outputs.github-archives }}
220220
path: target/distrib/
221221
merge-multiple: true
222222
- id: cargo-dist
@@ -255,23 +255,23 @@ jobs:
255255
with:
256256
name: dist-manifest-global-${{ github.run_id }}-${{ github.run_attempt }}
257257
path: ${{ env.BUILD_MANIFEST_NAME }}
258-
# Determines if we should publish/announce
259-
host:
258+
# Finalize the cargo-dist manifest before publication
259+
finalize-dist-manifest:
260260
needs:
261261
- plan
262-
- build-release-binaries
262+
- build-release-artifacts
263263
- build-docker
264-
- build-global-artifacts
265-
- generate-checksum-manifest
266-
- sign-release-binaries
264+
- build-global-dist-artifacts
265+
- generate-local-dist-manifest
266+
- assemble-release-artifacts
267267
# Only run if we're publishing and the required builds and signing succeeded (skipped builds are fine).
268-
if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && needs.sign-release-binaries.result == 'success' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-release-binaries.result == 'skipped' || needs.build-release-binaries.result == 'success') && (needs.build-docker.result == 'skipped' || needs.build-docker.result == 'success') }}
268+
if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && needs.assemble-release-artifacts.result == 'success' && (needs.build-global-dist-artifacts.result == 'skipped' || needs.build-global-dist-artifacts.result == 'success') && (needs.build-release-artifacts.result == 'skipped' || needs.build-release-artifacts.result == 'success') && (needs.build-docker.result == 'skipped' || needs.build-docker.result == 'success') }}
269269
env:
270270
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
271271
runs-on: "depot-ubuntu-latest-4"
272272
outputs:
273273
val: ${{ steps.host.outputs.manifest }}
274-
github-artifacts: ${{ needs.sign-release-binaries.outputs.github-archives }},${{ needs.build-global-artifacts.outputs.artifacts }},${{ steps.manifest.outputs.artifact-id }}
274+
github-artifacts: ${{ needs.assemble-release-artifacts.outputs.github-archives }},${{ needs.build-global-dist-artifacts.outputs.artifacts }},${{ steps.manifest.outputs.artifact-id }}
275275
steps:
276276
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
277277
with:
@@ -284,7 +284,7 @@ jobs:
284284
- name: Fetch release artifacts and manifests
285285
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
286286
with:
287-
artifact-ids: ${{ needs.plan.outputs.artifact }},${{ needs.generate-checksum-manifest.outputs.artifact }},${{ needs.build-global-artifacts.outputs.manifest }},${{ needs.sign-release-binaries.outputs.github-archives }},${{ needs.build-global-artifacts.outputs.artifacts }}
287+
artifact-ids: ${{ needs.plan.outputs.artifact }},${{ needs.generate-local-dist-manifest.outputs.artifact }},${{ needs.build-global-dist-artifacts.outputs.manifest }},${{ needs.assemble-release-artifacts.outputs.github-archives }},${{ needs.build-global-dist-artifacts.outputs.artifacts }}
288288
path: target/distrib/
289289
merge-multiple: true
290290
# This is a harmless no-op for GitHub Releases, hosting for that happens in "publish-github"
@@ -307,7 +307,7 @@ jobs:
307307
publish-docker:
308308
needs:
309309
- plan
310-
- host
310+
- finalize-dist-manifest
311311
- release-gate
312312
- build-docker
313313
uses: ./.github/workflows/publish-docker.yml
@@ -323,17 +323,17 @@ jobs:
323323
publish-pypi:
324324
needs:
325325
- plan
326-
- host
326+
- finalize-dist-manifest
327327
- release-gate
328-
- sign-release-binaries
328+
- assemble-release-artifacts
329329
if: ${{ !fromJson(needs.plan.outputs.val).announcement_is_prerelease || fromJson(needs.plan.outputs.val).publish_prereleases }}
330330
uses: $/.github/workflows/publish-pypi.yml
331331
with:
332332
plan: ${{ needs.plan.outputs.val }}
333-
uv-wheels: ${{ needs.sign-release-binaries.outputs.uv-wheels }}
334-
uv-build-wheels: ${{ needs.sign-release-binaries.outputs.uv-build-wheels }}
335-
uv-sdist: ${{ needs.sign-release-binaries.outputs.uv-sdist }}
336-
uv-build-sdist: ${{ needs.sign-release-binaries.outputs.uv-build-sdist }}
333+
uv-wheels: ${{ needs.assemble-release-artifacts.outputs.uv-wheels }}
334+
uv-build-wheels: ${{ needs.assemble-release-artifacts.outputs.uv-build-wheels }}
335+
uv-sdist: ${{ needs.assemble-release-artifacts.outputs.uv-sdist }}
336+
uv-build-sdist: ${{ needs.assemble-release-artifacts.outputs.uv-build-sdist }}
337337
secrets: inherit
338338
# publish jobs get escalated permissions
339339
permissions:
@@ -343,7 +343,7 @@ jobs:
343343
publish-crates:
344344
needs:
345345
- plan
346-
- host
346+
- finalize-dist-manifest
347347
- release-gate
348348
- publish-pypi # DIRTY: see #16989
349349
if: ${{ !fromJson(needs.plan.outputs.val).announcement_is_prerelease || fromJson(needs.plan.outputs.val).publish_prereleases }}
@@ -360,16 +360,16 @@ jobs:
360360
publish-github:
361361
needs:
362362
- plan
363-
- host
363+
- finalize-dist-manifest
364364
- release-gate
365365
- publish-docker
366366
- publish-pypi
367-
- sign-release-binaries
367+
- assemble-release-artifacts
368368
# Use `always()` so `publish-pypi` can skip prereleases while the required
369369
# builds and Docker publication must still succeed.
370370
# `publish-crates` is intentionally not a dependency: it's not
371371
# critical to the release and isn't idempotent on retry.
372-
if: ${{ always() && needs.host.result == 'success' && needs.release-gate.result == 'success' && needs.sign-release-binaries.result == 'success' && needs.publish-docker.result == 'success' && (needs.publish-pypi.result == 'skipped' || needs.publish-pypi.result == 'success') }}
372+
if: ${{ always() && needs.finalize-dist-manifest.result == 'success' && needs.release-gate.result == 'success' && needs.assemble-release-artifacts.result == 'success' && needs.publish-docker.result == 'success' && (needs.publish-pypi.result == 'skipped' || needs.publish-pypi.result == 'success') }}
373373
runs-on: "${{ github.repository_owner == 'astral-sh' && 'github-ubuntu-24.04-x86_64-4' || 'ubuntu-latest' }}"
374374
environment:
375375
name: release
@@ -386,7 +386,7 @@ jobs:
386386
- name: "Download GitHub Artifacts"
387387
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
388388
with:
389-
artifact-ids: ${{ needs.host.outputs.github-artifacts }}
389+
artifact-ids: ${{ needs.finalize-dist-manifest.outputs.github-artifacts }}
390390
path: artifacts
391391
merge-multiple: true
392392
- name: Attest
@@ -412,9 +412,9 @@ jobs:
412412
- name: Create GitHub Release
413413
env:
414414
GH_TOKEN: ${{ steps.release-token.outputs.token }}
415-
PRERELEASE_FLAG: "${{ fromJson(needs.host.outputs.val).announcement_is_prerelease && '--prerelease' || '' }}"
416-
ANNOUNCEMENT_TITLE: "${{ fromJson(needs.host.outputs.val).announcement_title }}"
417-
ANNOUNCEMENT_BODY: "${{ fromJson(needs.host.outputs.val).announcement_github_body }}"
415+
PRERELEASE_FLAG: "${{ fromJson(needs.finalize-dist-manifest.outputs.val).announcement_is_prerelease && '--prerelease' || '' }}"
416+
ANNOUNCEMENT_TITLE: "${{ fromJson(needs.finalize-dist-manifest.outputs.val).announcement_title }}"
417+
ANNOUNCEMENT_BODY: "${{ fromJson(needs.finalize-dist-manifest.outputs.val).announcement_github_body }}"
418418
RELEASE_COMMIT: "${{ github.sha }}"
419419
NEEDS_PLAN_OUTPUTS_TAG: ${{ needs.plan.outputs.tag }}
420420
run: |
@@ -450,14 +450,14 @@ jobs:
450450
publish-mirror:
451451
needs:
452452
- plan
453-
- host
453+
- finalize-dist-manifest
454454
- publish-github
455-
- sign-release-binaries
456-
if: ${{ always() && needs.publish-github.result == 'success' && needs.sign-release-binaries.result == 'success' }}
455+
- assemble-release-artifacts
456+
if: ${{ always() && needs.publish-github.result == 'success' && needs.assemble-release-artifacts.result == 'success' }}
457457
uses: $/.github/workflows/publish-mirror.yml
458458
with:
459459
plan: ${{ needs.plan.outputs.val }}
460-
github-artifacts: ${{ needs.host.outputs.github-artifacts }}
460+
github-artifacts: ${{ needs.finalize-dist-manifest.outputs.github-artifacts }}
461461
secrets: inherit
462462
permissions:
463463
"contents": "read"

0 commit comments

Comments
 (0)