Repository navigation
π fix(ci): backport the native-queue-policy forward-merge dco path to v6 - #17121
hivecommons-hive[bot] wants to merge 2 commits into
Conversation
β¦policy verdict (#16988) * fix(ci): re-validate policy checks before replaying a native-queue-policy verdict Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix(ci): fall through to the full wait when a replayed policy provider is pending replayLastVerdict re-validates POLICY_CHECKS before replaying a prior success, but assertEvidence throws PendingEvidence for a missing or still-running provider and the workflow's replay step only tolerates transient API errors. A cosmetic label flip during a provider re-run therefore failed native-queue-policy outright with no retry. Catch PendingEvidence and return null so the caller runs the normal polling wait; add queued/in-progress/missing provider tests. Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix(ci): fall through on DCO UNKNOWN during replay; refresh replay docs Address review findings on #16988: - replayLastVerdict now returns null for ProviderUnavailable too, so the full wait re-raises it once and renders the runbook job summary instead of a bare setFailed from the label-flip step. - Re-flow the replayLastVerdict doc comment to ~80 columns. - native-merge-queue.md: replay re-validates the five policy checks on the head; red fails, pending/missing/UNKNOWN falls through. - Test: UNKNOWN DCO on replay falls through. Hive-Fix-Attempt: 2/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Signed-off-by: ci-maintainer <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit eac7f88) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
β¦/v5-to-v6 forward-merges (#17050) Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> (cherry picked from commit bde11aa) 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 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
Hive status β updated in place; edits do not notify. Full history is in the Activity Monitor. 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 |
|
Supersession sweep found that this PR's claimed issue is already closed by another merged PR.
Closing this hive-authored PR because the claimed issue was already closed by the merged PR below. This comment is edited in place by the supersession sweep; it is not duplicated. |
There was a problem hiding this comment.
No-op against v6: #17118 (merged as 87bfaf3e9) already carries this exact change.
What I verified from the tree, not the PR body:
git diff origin/v6 pr17121 -- .github/scripts/native-queue-policy.cjs .github/scripts/native-queue-policy.test.cjsis empty β both files on this branch are byte-identical to the currentv6tip.v6history on.github/scripts/native-queue-policy.cjsalready hasbde11aa2c(#17050) andeac7f886d(#16988), brought in by the forward-merge #17118 (87bfaf3e9 Merge pull request #17118 from hivecommons/topup/v5-to-v6-release-line).- The branch is also byte-identical to
v5for these two files, so the backport itself was accurate β it was just overtaken while open (merge-basedd6b37214is 37 commits behindv6).
The code itself: forwardMergeDCOPath (native-queue-policy.cjs:170-207) is the same narrow shape check that is already live on v6, so there is nothing new to review here.
Flagging for a maintainer: this can be closed as superseded by #17118. I have not closed anything.
β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
Backports #16988 and #17050 (the fix for #17030) from
v5ontov6.Why:
native-queue-policy.ymldeliberately checks out the base branch head to validate a PR, never the candidate. For a v5βv6 forward-merge the base isv6, whose copy of.github/scripts/native-queue-policy.cjspredates #17050 β so the prow-dcopath forv5-reachablesync/v5-to-v6commits never runs, and probotDCO: action_required(profile-name "Andy" vs sign-off "Andrew" on already-merged v5 squash commits) fails the check. Every forward-merge intov6is therefore blocked untilv6itself carries the path (#17025 has hit this three times and is escalated). The forward-merges carry the fix in their own diff, but the workflow never reads it β chicken-and-egg; this PR breaks it.Clean
git cherry-pick -x -sof both v5 commits, no conflicts. Both are.github/+ docs only, so nochangelog.dfragment is needed. The nextsync/v5-to-v6merge will see identical content and merge cleanly.Refs #17030 (already closed by #17050 on v5; this is the v6 half). Unblocks #17025.
β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88