ci(release): harden core-release workflow (fixes from 1.47.10) #14039
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,36 @@ | ||
| name: Enforce Greatest-Semver-Wins Latest Release | ||
|
|
||
| # Un-publishing the latest release rolls Latest back on purpose. | ||
|
|
||
| on: | ||
| release: | ||
| types: [published, edited, unpublished, deleted] | ||
| workflow_dispatch: {} | ||
| workflow_call: {} | ||
| schedule: | ||
| - cron: '0 4 * * *' | ||
|
|
||
| concurrency: | ||
| group: enforce-latest-release | ||
| cancel-in-progress: false | ||
|
Contributor
There was a problem hiding this comment. delete:
Contributor
There was a problem hiding this comment. Fixed in |
||
|
|
||
| jobs: | ||
| enforce-latest: | ||
| runs-on: ubuntu-latest | ||
| # On workflow_call the actor is whoever merged the release PR, often a bot. | ||
| if: github.event_name != 'release' || github.triggering_actor != 'github-actions[bot]' | ||
| permissions: | ||
| contents: write | ||
| steps: | ||
| # workflow_call inherits the caller's refs/pull/N/merge, gone once it closes. | ||
| - uses: actions/checkout@v7 | ||
| with: | ||
| ref: main | ||
| sparse-checkout: scripts/cicd/reconcile-latest-release.sh | ||
| sparse-checkout-cone-mode: false | ||
|
|
||
| - name: Reconcile Latest to the highest stable semver release | ||
| env: | ||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| REPO: ${{ github.repository }} | ||
| run: ./scripts/cicd/reconcile-latest-release.sh | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| : "${PACKAGE:?PACKAGE is required}" | ||
| : "${TARGET_VERSION:?TARGET_VERSION is required}" | ||
| : "${TARGET_BRANCH:?TARGET_BRANCH is required}" | ||
|
|
||
| readonly TAG="v${TARGET_VERSION}" | ||
| failed=0 | ||
|
|
||
| summary() { | ||
| [[ -n "${GITHUB_STEP_SUMMARY:-}" ]] && printf '%s\n' "$@" >>"$GITHUB_STEP_SUMMARY" | ||
| return 0 | ||
| } | ||
|
|
||
| fail() { | ||
| echo "::error title=$1::$2" | ||
| summary "- FAIL: $2" | ||
| failed=1 | ||
| } | ||
|
|
||
| assert_nothing_stranded_past_the_tag() { | ||
| if ! git fetch --quiet --tags origin "$TARGET_BRANCH"; then | ||
| fail "Fetch failed" "Could not fetch ${TARGET_BRANCH} from origin." | ||
| return | ||
| fi | ||
| if ! git rev-parse -q --verify "refs/tags/${TAG}^{commit}" >/dev/null; then | ||
| fail "Release tag missing" "Tag ${TAG} not found." | ||
| return | ||
| fi | ||
|
|
||
| local stranded | ||
| stranded=$(git rev-list "${TAG}..FETCH_HEAD" --count) || stranded="" | ||
| if [[ ! "$stranded" =~ ^[0-9]+$ ]]; then | ||
| fail "Stranded count unavailable" "git rev-list failed or returned non-numeric output." | ||
| elif ((stranded != 0)); then | ||
| fail "Commits stranded past the release tag" \ | ||
| "${stranded} commit(s) on ${TARGET_BRANCH} are newer than ${TAG}; the published release does not contain them." | ||
| else | ||
| summary "- OK: no commits stranded past \`${TAG}\`" | ||
| fi | ||
| } | ||
|
|
||
| assert_version_on_pypi() { | ||
| local http_code | ||
| http_code=$(curl -s --connect-timeout 10 --max-time 30 -o /dev/null -w '%{http_code}' \ | ||
| "https://pypi.org/pypi/${PACKAGE}/${TARGET_VERSION}/json") || http_code="000" | ||
| if [[ "$http_code" == "200" ]]; then | ||
| summary "- OK: PyPI has \`${PACKAGE}==${TARGET_VERSION}\`" | ||
| else | ||
| fail "Target version missing on PyPI" "${PACKAGE}==${TARGET_VERSION} returned HTTP ${http_code}." | ||
| fi | ||
| } | ||
|
|
||
| # A core/* patch must not steal PyPI's `latest` from a higher minor. | ||
| assert_pypi_latest_only_for_main() { | ||
| local pypi_latest | ||
| pypi_latest=$(curl -sf --connect-timeout 10 --max-time 30 "https://pypi.org/pypi/${PACKAGE}/json" | | ||
| jq -r '.info.version // empty') || pypi_latest="" | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| if [[ -z "$pypi_latest" ]]; then | ||
| fail "PyPI latest unavailable" "Failed to query the PyPI info endpoint for ${PACKAGE}." | ||
| elif [[ "$TARGET_BRANCH" == "main" && "$pypi_latest" != "$TARGET_VERSION" ]]; then | ||
| fail "PyPI latest mismatch" "PyPI latest is ${pypi_latest}, expected ${TARGET_VERSION}." | ||
| else | ||
| summary "- Info: PyPI \`latest\` = \`${pypi_latest}\` (target branch \`${TARGET_BRANCH}\`)" | ||
| fi | ||
| } | ||
|
|
||
| warn_if_comfyui_pin_stale() { | ||
| local reqs pin="" | ||
| if reqs=$(curl -sf --connect-timeout 10 --max-time 30 \ | ||
| "https://raw.githubusercontent.com/Comfy-Org/ComfyUI/master/requirements.txt"); then | ||
| pin=$(grep -oE "${PACKAGE}==[0-9.]+" <<<"$reqs" | head -1 | cut -d= -f3) || pin="" | ||
| fi | ||
|
|
||
| if [[ "$pin" == "$TARGET_VERSION" ]]; then | ||
| summary "- OK: ComfyUI \`master\` pins \`${TARGET_VERSION}\`" | ||
| else | ||
| echo "::warning title=ComfyUI pin not yet updated::ComfyUI master pins ${pin:-<none>}, target ${TARGET_VERSION}." | ||
| summary "- Warn: ComfyUI \`master\` pins \`${pin:-<none>}\`, target \`${TARGET_VERSION}\`" | ||
| fi | ||
| } | ||
|
|
||
| summary "## Release-done assertion" "" "Target: \`${TAG}\` on \`${TARGET_BRANCH}\`" "" | ||
|
|
||
| assert_nothing_stranded_past_the_tag | ||
| assert_version_on_pypi | ||
| assert_pypi_latest_only_for_main | ||
| warn_if_comfyui_pin_stale | ||
|
Contributor
There was a problem hiding this comment. delete: This pin check runs immediately after opening the pin PR, before anyone can merge it, so its warning is expected noise. Remove
Contributor
There was a problem hiding this comment. Fixed in |
||
|
|
||
| if ((failed != 0)); then | ||
| echo "release-done assertion FAILED — see annotations above." | ||
| exit 1 | ||
| fi | ||
| echo "release-done assertion passed." | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
delete:
if: success()is already the job default, and reusable workflows receive the specialGITHUB_TOKENautomatically, sosecrets: inheritis unnecessary here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kept it removed as a blanket
secrets: inherit. Had to add back a scoped explicit pass-through forPR_GH_TOKENspecifically though (declaredrequiredonrelease-enforce-latest.yaml'sworkflow_call, passed explicitly here) —gh release edit --latestgets a 403 "Resource not accessible by integration" from the defaultGITHUB_TOKENon core//cloud/ release branches, so the reconcile step needsPR_GH_TOKENspecifically, and without any pass-through that secret resolves to empty in the reusable workflow.Created by Claude Code
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in
bc117987e4and816ad9f7ee: removed defaultif: success()and blanket inheritance, then passed onlyPR_GH_TOKEN, which the release edit requires.