Skip to content

ci: Sequence release publication and PR generation - #350

Merged
scouten-adobe merged 2 commits into
mainfrom
fix/release-pr-branch-guards
Sep 25, 2026
Merged

scouten-adobe merged 2 commits into
mainfrom
fix/release-pr-branch-guards

Conversation

@scouten-adobe

Copy link
Copy Markdown
Collaborator

Summary

  • Run release-PR generation as a job in release.yml, after the publish job succeeds. A fresh checkout with full tag history then sees any tag created by publication before calculating the next release, avoiding stale release PRs like chore: release v0.29.0-dev #349.
  • Remove the separately triggered release-pr.yml, which could race with publishing on the same release-line push and could be manually dispatched on main.
  • Keep cleanup scoped to closed release-plz-* PR branches for the current base line, preventing cleanup on stable from deleting another release line's active branch.
  • Update promotion and release-process documentation, including the train-cut issue instructions.

The combined workflow remains triggered only on stable and v0.*, so active and retired release lines use the same ordered release process.

Validation

  • actionlint passed for the updated release and promotion workflows.
  • YAML parsing and git diff --check passed.
  • Confirmed no tracked references to the deleted workflow remain.

After review and merge to main, this can be backported to stable.

scouten-adobe and others added 2 commits September 25, 2026 13:02
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
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>
@codecov

codecov Bot commented Sep 25, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 76.42%. Comparing base (df0e309) to head (a39cd55).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #350   +/-   ##
=======================================
  Coverage   76.42%   76.42%           
=======================================
  Files           4        4           
  Lines        1073     1073           
=======================================
  Hits          820      820           
  Misses        253      253           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

echo "$RELEASES"
echo "==========================="

release-pr:

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This mirrors a recent changes made in contentauth/c2pa-rs#2698 and should fix the race condition that allowed for release PR misfires.

@scouten-adobe scouten-adobe changed the title ci: sequence release publication and PR generation ci: Sequence release publication and PR generation Sep 25, 2026
@scouten-adobe scouten-adobe added the backport-stable Cherry-pick this merged main PR onto the stable release line label Sep 25, 2026
@scouten-adobe
scouten-adobe enabled auto-merge (squash) September 25, 2026 20:23
@scouten-adobe
scouten-adobe merged commit 3f0165c into main Sep 25, 2026
18 of 19 checks passed
@scouten-adobe
scouten-adobe deleted the fix/release-pr-branch-guards branch September 25, 2026 20:29
@caiopensrc

caiopensrc commented Sep 25, 2026 •

Copy link
Copy Markdown
Collaborator

Backport-action failed to backport this pull request in workflow run 36186036296.

Target Status
stable ❌ Failed
❌ stable — unable to cherry-pick

Tried to cherry-pick commits onto stable, but the cherry-pick failed.

Please cherry-pick the changes locally and resolve any conflicts:

git fetch origin stable
git worktree add -d .worktree/backport-350-to-stable origin/stable
cd .worktree/backport-350-to-stable
git switch --create backport-350-to-stable
git cherry-pick -x 3f0165c2f7af3fb859a780449c022481dac8b9f2

scouten-adobe added a commit that referenced this pull request Sep 25, 2026
)

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-stable Cherry-pick this merged main PR onto the stable release line

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants