Skip to content

🐛 fix(tracker): PRs at CI / Review ride no merge train; overlap hint instead - #15658

Merged
clubanderson merged 2 commits into
v5from
fix/train-cireview-overlap-hint
Oct 30, 2026
Merged

clubanderson merged 2 commits into
v5from
fix/train-cireview-overlap-hint

Conversation

@clubanderson

@clubanderson clubanderson commented Oct 30, 2026 •

Copy link
Copy Markdown
Member

Fixes #15653

Why the train appeared

hive's own page (roll 9 = v5, 2026-10-29 ~20:00 EDT) led ⛁ merge train · 2 PRs · 1st: #15637 — overlapping: sidebar.html, index.html under #15637 and #15633 while both chevrons read CI / Review.

Change

The merge train is a merge-queue concept: only PRs at ≥080 ride one, and the header counts only them.

  • stageTrackerBelowMergeQueue: a planner-ordered PR below 080 leaves the train in the view; the 080+ members close ranks (size, position, front, ahead, members, and the front's gate/caption recomputed); one member left is no train.
  • Such a row carries overlap: {behind, with, files, note} instead of merge_train (mirrored onto linked_prs[]): the SPA draws one muted badge overlaps 📖 community: list the Twitch live stream everywhere community links live #15637 with hover Not in the merge queue yet: overlaps 📖 community: list the Twitch live stream everywhere community links live #15637 (sidebar.html, index.html) — will queue behind it (the planner's front: … merges ahead of it once both are ready). No rail, ordinal or "1st:" header.
  • merge_train.provisional and "merges first once it is ready" removed from the server; the SPA keeps the provisional words only as a fallback for a stale payload.
  • Docs (dashboard-sections.md § Merge train, api-reference/dashboard-misc.md) and changelog fragment.

Not changed: the planner still orders CI-pending PRs with ready ones on the lane side (a ready 080 PR can wait behind a CI-pending front); noted in the issue as a separate automerge question.

Tests

  • TestStageTrackerMergeTrainCIReviewPairRidesNoTrain — 📖 community: list the Twitch live stream everywhere community links live #15637/🌱 refactor: split stage tracker UI tests #15633 exactly: no merge_train, no left_train, hint on both rows, payload shape.
  • TestStageTrackerMergeTrainCountsOnlyMergeQueueMembers — 080/050/080: train of 2, "1st of 2", the 050 row hints at the front.
  • TestStageTrackerMergeTrainPendingFrontLeavesLoneRider — 050 front + 080 sibling: no train, 080 row back to its own caption.
  • stage_tracker_overlap_hint.test.js — badge, hover, tooltip line, precedence over train / left-train.
  • go test ./pkg/dashboard/... and node --test src/pkg/dashboard/*.test.js green; bundle regenerated from static-src/.

Follow-up: "what does 'not in this view' mean?"

The header merge train · 2 of 9 PRs here · 1st: #15516 · not in this view: 7 more counted the planner's whole overlap group (9) minus the rows drawn. The seven were PRs the planner grouped by shared files but that never carried a train record in the payload — still at CI / Review (below 080), under repair, or no longer listed — so they were counted but never seated. Yes: members share files, so each can only rebase onto the base after the one ahead merges.

Now: size/members count only the PRs riding in this payload (≥080). If the page does not draw every member the header says why: on another page: #N, hidden by the filter: #N, not in this payload: #N. The header's hover states the mechanics (shared files → merge one at a time, in order; each rebased only after the PR ahead merges); a member's hover shows Position: 3rd of 4 · after #X merges.

Tests: Go TestStageTrackerMergeTrainSizeCountsRidersInPayload; JS header cases (all on page / other page / filtered / payload-missing / no context) in stage_tracker_merge_train_test.go.

@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 hanthor 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 dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 30, 2026
@github-actions

github-actions Bot commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

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

PR Title Relation Files
#15521 🌱 refactor: split tracker row source CONFLICT src/pkg/dashboard/static-src/js/tracker-row.js
#15530 🐛 fix(dashboard): issue-row linked PR passes null when the lineage chip is empty same files src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static/index.html
#15566 🌱 refactor: split stage tracker UI tests same files src/pkg/dashboard/static/index.html
#15633 🌱 refactor: split stage tracker UI tests same files src/pkg/dashboard/static/index.html

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@clubanderson this PR is held at stage/071-needs-author and the hive will not merge it yet.

Failing checks:

  • test (dashboard 2/4)
  • test (dashboard shuffle 1/3)

Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 071-needs-author: optional-check-failing:test (dashboard 2/4)

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 071-needs-author: label:needs-rebase

@clubanderson
clubanderson force-pushed the fix/train-cireview-overlap-hint branch from ad1193e to a796fef Compare October 30, 2026 04:31
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2026
@github-actions github-actions Bot added conflicts-with-open-pr Open PR has a merge conflict with another open PR and removed conflicts-with-open-pr Open PR has a merge conflict with another open PR labels Oct 30, 2026
…iders

The merge train is a merge-queue concept: only PRs at 080+ ride it. A PR
still at CI / Review whose files overlap a queued PR gets a lightweight
"overlaps #N — will queue behind it" hint instead of a rail or ordinal.

The header counts only the riders in this payload (never the planner's
wider grouping — hive's own page read "2 of 9 PRs here · not in this
view: 7 more" over two queued PRs), says where undrawn members are (on
another page / hidden by the filter / not in this payload), and its hover
explains the order: shared files, merge one at a time, each rebased onto
the base only after the PR ahead merges; a member reads "Nth of M · after

Fixes #15653

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@clubanderson this PR is held at stage/071-needs-author and the hive will not merge it yet.

Why:

  • the branch conflicts with the base and needs a rebase

Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 071-needs-author: conflicting

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 30, 2026
@clubanderson
clubanderson merged commit 03483af into v5 Oct 30, 2026
77 checks passed
@clubanderson
clubanderson deleted the fix/train-cireview-overlap-hint branch October 30, 2026 05:45
@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: required-check-pending:coverage

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

Labels

conflicts-with-open-pr Open PR has a merge conflict with another open PR dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Activity Monitor draws a merge train over PRs still at CI / Review (#15637 / #15633)

1 participant