Skip to content

Gate: merge whichever way the repo allows and retry while main settles - #35

Merged
DevinMB merged 1 commit into
mainfrom
fix/gate-robust-merge
Nov 16, 2026
Merged

DevinMB merged 1 commit into
mainfrom
fix/gate-robust-merge

Conversation

@DevinMB

@DevinMB DevinMB commented Nov 16, 2026

Copy link
Copy Markdown
Owner

The Dependabot gate Argus writes into a repo's ci.yml merged with a single gh 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, and VERSION 1 to 2, so repos with a pipeline 1 ci.yml are 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

…s (pipeline 2)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HnRaQnVnKQgNdvSVhoqSpi
@DevinMB
DevinMB merged commit 109e580 into main Nov 16, 2026
4 checks passed
@DevinMB
DevinMB deleted the fix/gate-robust-merge branch November 16, 2026 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant