Repository navigation
ci: Make failed backports visible - #352
Open
scouten-adobe wants to merge 1 commit into
Open
scouten-adobe wants to merge 1 commit into
scouten-adobe wants to merge 1 commit into
Conversation
Release-line branches legitimately diverge from `main`, so conflicting cherry-picks are routine. With `conflict_resolution: fail` (the default) the backport action produced no branch and no pull request on conflict, yet the workflow run still reported success -- so a broken backport was invisible unless someone read the comments on the source PR. * Switch to `conflict_resolution: draft_commit_conflicts` so a conflicted backport still yields a draft PR with the conflict committed. * Skip auto-merge on draft backport PRs (GitHub refuses auto-merge on a draft, and they need a human anyway). * Fail the run when any target was unsuccessful. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #352 +/- ##
=======================================
Coverage 76.42% 76.42%
=======================================
Files 4 4
Lines 1073 1073
=======================================
Hits 820 820
Misses 253 253 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
ok-nick
approved these changes
Sep 25, 2026
ok-nick
left a comment
ok-nick
left a comment
Contributor
There was a problem hiding this comment.
I like this, we should bring it over to c2pa-rs if not done already.
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
2 participants
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.
Problem
The automated backport of #350 to
stable"succeeded" while producing nothing. Run 36186036296 shows:The action posted its summary comment on #350 and exited 0. The auto-merge step was skipped because
created_pull_numberswas empty, and the run got a green check.This is not a one-off. Run 36175861332 ("fix: Report failed fragments rather than dropping them") hit
CONFLICT (content): Merge conflict in src/main.rsand did the same thing. Every conflicting backport silently no-ops with a success badge, which is why recent backports appeared to just not happen.Release lines legitimately diverge from
main--stablecarries 9 workflows to the 15 onmain, plus older dependency pins and its own changelog -- so conflicting cherry-picks are routine, not exceptional.conflict_resolution: failis the wrong default for this repo.Changes
conflict_resolution: draft_commit_conflicts-- a conflicted backport now commits the first conflict and opens a draft PR, so there is a branch and a PR to finish by hand instead of nothing.was_successful != 'true', so conflicted backports show red in the Actions list.pull_description, the workflow header comment, anddocs/release-process.mdupdated to describe the draft-conflict flow.Validation
actionlintclean. The behavior change can only be exercised by a real backport; the next labeled PR that conflicts will demonstrate it.Follow-up
#350 still needs a hand-resolved backport to
stable-- that is a separate PR.