Repository navigation
π fix(automerge): /hive approve reply matches the tests-removed lane stop - #15041
hivecommons-hive[bot] wants to merge 1 commit into
Conversation
β¦ removes tests Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.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 |
|
hive/awaiting-ci: CI pending β sweep will merge when green. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
Open PR overlap checkBase branch:
Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
There was a problem hiding this comment.
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 atpr_approve_command.go:88. The fix is correct in both βcontributorLaneDiffReasonreturnsworkflow-pathbefore it ever consults the tests-removed fence (automerge_contributor_lane.go:1079-1083), so a head that edits workflows and removes tests reported onlyworkflow-pathhere 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 existingTestPRApproveReplytable withremovedTest/releaseFencecolumns 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-codedContributorLanePolicy{Enabled: true}, soOwnerApprovalReleasesWorkflowFencewas 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
|
Superseded: the same change landed on v6 via #15048 (f3e4df7, same reply caption and π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
The
/hive approvereply 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 atcontributor-lane:tests-removedregardless 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