ci: Sequence release publication and PR generation (backport #350) - #353
Merged
Merged
Conversation
* fix: guard release PR workflow branches Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * ci: sequence release publication and PR generation Run release-pr generation after release-plz publishes and tags, so the fresh checkout calculates the next release against the new tag. Keep stale branch cleanup scoped to closed PRs for the release line and update release-train instructions.\n\nCo-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 3f0165c)
scouten-adobe
enabled auto-merge (squash)
September 25, 2026 20:44
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## stable #353 +/- ##
=======================================
Coverage 72.58% 72.58%
=======================================
Files 4 4
Lines 1047 1047
=======================================
Hits 760 760
Misses 287 287 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
ok-nick
approved these changes
Sep 25, 2026
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hand-resolved backport of #350 to
stable. The automated backport (run 36186036296) could not apply it:release-train-cut.ymlis amain-only workflow, so the one-line hunk touching it was dropped. Everything else applied cleanly: after this changerelease.yml,promote.yml, anddocs/release-process.mdare byte-identical tomain, andrelease-pr.ymlis gone from this line too.What this brings to
stable.github/workflows/release-pr.yml. Its independentpush/workflow_dispatchtrigger is what produced the bogus release PR chore: release v0.29.0-dev #349 againstmain, and it also raced the publish workflow.release.ymlgated onneeds: release-plz, with a freshfetch-depth: 0checkout so release-plz sees the tag the publish job just created. Without that ordering, release-plz baselines on the previous tag and proposes a wrong version with the prior release's changelog (the failure seen in chore: release v0.92.0 c2pa-rs#2694, fixed by ci: Sequence release-plz publish and PR jobs c2pa-rs#2698).release-plz-*branches of closed PRs whose base is the current release line, instead of pruning everyrelease-plz-*branch repo-wide (which could delete another line's in-flight release PR).promote.ymlnarration anddocs/release-process.mdto match.Validation
actionlintclean; diff verified identical tomainfor all three shared files. No remaining references torelease-pr.yml.Note for reviewers
This needs the
upstream-first-verifiedlabel: dropping therelease-train-cut.ymlhunk changes the patch id, soupstream-first-check.ymlwill not match it againstmaineven though the change originated there.