Skip to content

πŸ› fix(automerge): /hive approve reply matches the tests-removed lane stop - #15041

Closed
hivecommons-hive[bot] wants to merge 1 commit into
v6from
scanner/fix-15034
Closed

hivecommons-hive[bot] wants to merge 1 commit into
v6from
scanner/fix-15034

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

The /hive approve reply promised that a trusted merger's Approve review would make the lane merge a workflow-path head. The contributor lane stops a head that also removes tests at contributor-lane:tests-removed regardless of approval, so that promise was misleading. The reply condition now also requires no tests-removed reason, so such heads get the generic manual-merge reply. Message-only change, with a regression test. Closes #15034

β€” hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

… removes tests

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 28, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign kellyaa for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: CI pending β€” sweep will merge when green.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

β€” hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@github-actions

github-actions Bot commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

This PR conflicts with v6 itself. Rebase it first: until it merges cleanly into the base, conflicts with other open PRs cannot be told apart from base drift, so only same-file overlaps are listed.

Conflicts are checked with every PR merged onto the current tip of v6, so a PR that only needs a rebase is not reported as conflicting with its siblings.

No conflicting open PRs or same-file overlaps were found.

@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This appears to duplicate #15048, which makes the same change to src/pkg/github/automerge/pr_approve_command.go for the same issue (#15034). Flagging for a maintainer; I have not closed anything.

What I verified by reading both diffs in full:

  • The production change is byte-identical: both add && contributorLaneTestsRemovedReason(files) == "" to the release-fence condition at pr_approve_command.go:88. The fix is correct in both β€” contributorLaneDiffReason returns workflow-path before it ever consults the tests-removed fence (automerge_contributor_lane.go:1079-1083), so a head that edits workflows and removes tests reported only workflow-path here and got the "approve and the lane merges" caption.
  • Both create changelog.d/fixed-approve-reply-tests-removed.md (same filename, different text), so whichever lands second will conflict on that file and on the condition line.
  • Tests differ in shape only. This PR adds a standalone TestPRApproveReplyWorkflowHeadThatRemovesTestsIsManualMerge. #15048 extends the existing TestPRApproveReply table with removedTest/releaseFence columns and adds two rows β€” the negative case this PR covers, plus a positive "owner approval releases workflow fence" row, which the table did not exercise before (it hard-coded ContributorLanePolicy{Enabled: true}, so OwnerApprovalReleasesWorkflowFence was never true in this test).

Why #15048 looks like the one to keep: it is the follow-up from #15027's author (the fix was pushed to that branch seconds after merge and never reached v6), it carries an explanatory comment on the condition, and its test covers both branches of the caption. This PR has nothing #15048 lacks.

β€” hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot closed this Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Superseded: the same change landed on v6 via #15048 (f3e4df7, same reply caption and contributorLaneTestsRemovedReason guard in pr_approve_command.go); closing this duplicate.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: 96e39fb

β€” hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/hive This repository's own hive (the App or one of its agent lanes) authored this PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/M Denotes a PR that changes 30-99 lines, ignoring generated files. stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Review backlog (security): /hive approve reply still promises owner-approval merge for a workflow+tests-removed head

0 participants