fix: prevent false-positive backport failure notifications#22539
Draft
fix: prevent false-positive backport failure notifications#22539
Conversation
The backport workflow was reporting cherry-pick conflicts when the cherry-pick actually succeeded but update-pr-body.sh failed afterward. With set -euo pipefail (from ci3/source_options), the post-processing failure caused the whole script to exit non-zero, triggering a false 'cherry-pick conflicts' notification and dispatching ClaudeBox unnecessarily. Changes: - Make update-pr-body.sh non-fatal in backport script (the backport itself already succeeded at that point) - Skip merge-train and backport-staging PRs explicitly in backport.yml (they were already filtered by label check, but this avoids running the label_checker job unnecessarily)
AztecBot
added
ci-draft
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
1 participant
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.
Summary
Fixes false-positive "cherry-pick conflicts" notifications in the backport workflow.
What happened with PR #22489: The backport script successfully cherry-picked, pushed, and created the staging PR, but
update-pr-body.shfailed afterward. Becauseci3/source_optionssetsset -euo pipefail, this post-processing failure caused the script to exit non-zero. The workflow then unconditionally reported "Failed to cherry-pick due to conflicts" and dispatched ClaudeBox to fix non-existent conflicts.Changes:
backport_to_staging.sh: Make theupdate-pr-body.shcall non-fatal (|| echo "Warning: ...") since the actual backport has already succeeded at that pointbackport.yml: Explicitly skip merge-train and backport-staging PRs in theifcondition (they were already filtered by label check, but this avoids running the label_checker job at all for these branches)ClaudeBox log: https://claudebox.work/s/45d3c5a07a4f7312?run=3