Repository navigation
π fix: leave held dependency-bot branches to the bot instead of merging the base - #16847
Conversation
β¦ng the base maintainHeldPRMergeability merged the base into every behind/dirty held PR under the hive's identity. Renovate stops rebasing a branch once another identity has committed to it, so a held Renovate PR was stranded behind its base and needed a hive merge on every base move. Evidence: projectbluefin/utah#1097 (renovate/*, held by human_merge_paths). Hive base merges moved its head bb9de1e -> 77cf7b9 -> b4de759 -> 3987386. Then Renovate said on 11-05 21:13 that it "will not automatically rebase ... does not recognize the last commit author". Held PRs whose head ref is renovate/* or whose author is one of the dependencyBots (renovate, dependabot, mergeraptor) are now skipped, with a debug log. There is no base-merge push and no conflict notice; the bot rebases the branch itself. No existing helper ticks Renovate's rebase checkbox, so none is added here. Signed-off-by: James Reilly <jreilly1821@gmail.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
There was a problem hiding this comment.
Read maintainHeldPRMergeability and the new dependencyBotBranch at the head (src/cmd/hive/main_helpers.go:357, :458). The skip sits after the behind/dirty filter and before both the own-only gate and the base-merge push, so neither the push nor the conflict notice fires for a renovate/* head or a dependencyBots author (main_sweeps.go:148, already the renovate/dependabot/mergeraptor set). HeadRef is populated on the batch path (pkg/github/client.go:2261, :2357), so the prefix test has data. go build ./cmd/hive/ passes at this head. Looks correct to me; the operator-reference row and changelog fragment match the behaviour.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
β¦th (#16862) #16847 stopped the hold guard from merging the base into held Renovate branches, but once the hold lifts the automerge lanes still did it. Renovate stops rebasing a branch for good once another identity has committed to it, so a single hive merge commit strands the PR behind its base. Evidence: projectbluefin/utah#1097 (renovate/*). Hive base merges moved its head bb9de1e -> 77cf7b9 -> b4de759 -> 3987386, then Renovate said on 11-05 21:13 that it "will not automatically rebase ... does not recognize the last commit author". Both projectbluefin repos require up-to-date branches, so Renovate rebases behind branches itself when nobody else commits to them. The predicate moves to pkg/github (DependencyBotBranch: a renovate/* head ref, or a renovate/dependabot/mergeraptor bot author) so the hold guard, isHiveAgentAuthor and the paths below share it. A dependency-bot branch now gets no hive commit from: - the lanes' update-branch (behind / required-checks-expected): holds as "behind"; - the current-base gate: holds as "behind" on a repo listed in require_current_base or when GitHub reports it behind; a repo gated only by the default merges it as tested, like a head the App may not write; - merge-forward of a trusted human's dirty PR; - the merge train's sibling update-branch and rebase requests, and the rebase request for a dirty front; - the fixer router's trusted-author rebase work; - adopted-PR stale-red recovery (skipped:dependency-bot-branch); - hive-merge --update-branch (the merge attempt still runs). Each skip is logged (automerge: once per head and step). Nothing in the codebase ticks Renovate's rebase checkbox, so no new writer is added; the bot rebases on its own under the strict rule. The dashboard's operator rebase actions and hive-owned paths (prfollowup, supersession resolve) are unchanged: they only update the hive's own PRs. Signed-off-by: James Reilly <jreilly1821@gmail.com>
maintainHeldPRMergeability merged the base into every behind/dirty held PR
under the hive's identity. Renovate stops rebasing a branch once another
identity has committed to it, so a held Renovate PR was stranded behind its
base and needed a hive merge on every base move.
Evidence: projectbluefin/utah#1097 (renovate/*, held by human_merge_paths).
Hive base merges moved its head bb9de1e -> 77cf7b9 -> b4de759 -> 3987386.
Then Renovate said on 11-05 21:13 that it "will not automatically rebase ...
does not recognize the last commit author".
Held PRs whose head ref is renovate/* or whose author is one of the
dependencyBots (renovate, dependabot, mergeraptor) are now skipped, with a
debug log. There is no base-merge push and no conflict notice; the bot
rebases the branch itself. No existing helper ticks Renovate's rebase
checkbox, so none is added here.
Found by auditing why hive stalls on projectbluefin/utah and projectbluefin/utah-packages. One concern per PR; sibling PRs from the same audit cover the other root causes.
Verification:
gofmt -lclean. Tests were not run locally, per AGENTS.md; CI is the verdict.