Repository navigation
Gate: merge whichever way the repo allows and retry while main settles - #35
Merged
Merged
Conversation
…s (pipeline 2) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HnRaQnVnKQgNdvSVhoqSpi
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.
The Dependabot gate Argus writes into a repo's
ci.ymlmerged with a singlegh pr merge --merge. That fails in two ordinary situations:The merge step now tries squash, then merge, then rebase, and retries up to six times, 20 s apart, on a transient refusal. A real conflict still fails with a clear
::error::; Dependabot then rebases and CI runs again.src/argus/pipeline.py: the new merge step, andVERSION1 to 2, so repos with a pipeline 1ci.ymlare offered the update..github/workflows/ci.yml: this repo's own gate uses the same step.tests/test_pipeline.py: checks the version and the new merge step.Checked the step's shell logic against a fake
gh: squash-only, merge-only, a race (retries, then merges) and a conflict (six tries, then fails).🤖 Generated with Claude Code
https://claude.ai/code/session_01HnRaQnVnKQgNdvSVhoqSpi