Repository navigation
fix(git-merge-pr): treat merge errors as transient when wait=true - #6447
Closed
AruneshDwivedi wants to merge 1 commit into
Closed
AruneshDwivedi wants to merge 1 commit into
AruneshDwivedi wants to merge 1 commit into
Conversation
When git-merge-pr is configured with wait:true and the merge API returns an error (e.g. 405 "Required status check is expected"), the step returns Running status instead of Failed+TerminalError so it retries on the next reconciliation. Previously, any error from MergePullRequest was treated as terminal, even when wait was enabled. This caused promotions to fail permanently on the first attempt when CI status checks were still pending. Fixes akuity#6397 Signed-off-by: Arunesh Dwivedi <[email protected]>
✅ Deploy Preview for docs-kargo-io ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
kargo-governance-bot
Bot
added
kind/bug
3 tasks done
Contributor
|
@AruneshDwivedi thanks again for your help. |
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.
When
git-merge-pris configured withwait: trueand the GitHub merge API returns a 405 (e.g. "Required status check is expected"), the step now returnsRunningstatus instead ofFailed. The 405 means the merge is blocked by a status check that hasn't completed yet -- it's transient, not a permanent failure.Previously, a single 405 would terminate the entire wait loop. Now it keeps polling until the merge succeeds or a non-transient error occurs.
Fixes #5761