Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a873530
πŸ› automerge: withdraw native-queue entries on release freeze and huma…
hivecommons-hive[bot] Oct 30, 2026
c19140c
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
2d55201
πŸ“ native-merge-queue: list release-freeze and human-merge-path withdr…
hivecommons-hive[bot] Oct 30, 2026
cc04980
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
d613de6
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
787827f
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
c490993
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
52f501c
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
3607fb7
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
e4be3d6
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
fb94901
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
cef3ea8
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
5b1569e
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
8dc3289
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
8907c1f
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
e6f002b
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
52c99e1
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
6ccdaba
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
355423d
Merge branch 'v5' into scanner/fix-15517
hivecommons-hive[bot] Oct 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Native merge queue withdrawal now also triggers on a release in progress and on a human-merge path, so a Hive-enqueued PR no longer keeps merging through GitHub's queue during a release freeze or after `human_merge_paths` changes (#15517).
4 changes: 2 additions & 2 deletions src/docs/native-merge-queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ close an issue. The stage observation carries the reason to the dashboard.

When the owning lane rejects a PR because it lost merge eligibility β€” a hold
or `do-not-merge`/`needs-human` label, a removed merger label, a missing,
untrusted or stale queue approval, changes requested, or a draft or closed
PR β€” Hive rechecks the entry's enqueuer and withdraws it only if it belongs to
untrusted or stale queue approval, changes requested, a draft or closed PR, a
release in progress on the repository, or a human-merge-path hold β€” Hive rechecks the entry's enqueuer and withdraws it only if it belongs to
this App (a `Bot` enqueuer whose login matches the App's slug). Every other
reason, including transient refusals such as `behind`, `not-mergeable`, pending
checks, a moved head, API read errors, author-routing skips and Hive's own
Expand Down
6 changes: 3 additions & 3 deletions src/pkg/github/automerge/automerge_native_queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ func ownNativeQueueEntry(e *hgithub.NativeMergeQueueEntry, slug string) bool {

// nativeQueueWithdrawReason reports whether a lane's rejection reason means
// the PR lost merge eligibility (#15198): a hold, a withdrawn or stale
// approval, changes requested, a paused or disabled repo, or a draft or
// closed PR. Anything else β€” pending or red checks, behind, a moved head, an
// approval, changes requested, a paused or disabled repo, a draft or closed
// PR, a release in progress, or a human-merge path. Anything else β€” pending or red checks, behind, a moved head, an
// API error, a routing observation β€” keeps the App's queue entry.
func nativeQueueWithdrawReason(reason string) bool {
switch reason {
Expand All @@ -149,7 +149,7 @@ func nativeQueueWithdrawReason(reason string) bool {
"queue-approval-missing-head", "queue-approval-head-changed", "self-merge-ban", autoMergeReasonUntrustedMerger,
"changes-requested", autoMergeReasonHumanChangesRequested, contributorLaneReasonChangesRequested,
nativeQueueReasonPaused, "repo-auto-merge-disabled", relayLaneReasonDisabled,
"draft", "closed":
"draft", "closed", releaseInProgressStatusContext, autoMergeReasonHumanMergePath:
return true
}
return strings.HasPrefix(reason, "label:do-not-merge") || strings.HasPrefix(reason, "excluded-label:") ||
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/github/automerge/automerge_native_queue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (denyNativeQueueBoundary) Execute(context.Context, effects.Claim, func(cont
}

func TestNativeQueueGateWithdrawsOnlyHiveEntries(t *testing.T) {
for _, reason := range []string{"held", "label:hold", "label:do-not-merge", "changes-requested", autoMergeReasonHumanChangesRequested, autoMergeReasonReviewGatePrefix + ReviewGateOutcomeChangesRequested, autoMergeReasonNoHiveQueueApproval, "queue-approval-head-changed", "label-removed", nativeQueueReasonPaused, "draft", "closed"} {
for _, reason := range []string{"held", "label:hold", "label:do-not-merge", "changes-requested", autoMergeReasonHumanChangesRequested, autoMergeReasonReviewGatePrefix + ReviewGateOutcomeChangesRequested, autoMergeReasonNoHiveQueueApproval, "queue-approval-head-changed", "label-removed", nativeQueueReasonPaused, "draft", "closed", releaseInProgressStatusContext, autoMergeReasonHumanMergePath} {
// A user account named like the App's slug is not the App.
for _, actor := range []string{testHiveAppBotLogin, "maintainer", "another-app[bot]", "", botSlug(testHiveAppBotLogin)} {
t.Run(reason+"/"+actor, func(t *testing.T) {
Expand Down
Loading