Skip to content

CI: a kicked merge-queue entry's dead run holds the concurrency group of its re-enqueue #5381

Open

Description

@noahgift

A merge-queue entry that is kicked and re-enqueued on the same base gets the SAME ref (gh-readonly-queue/main/pr-<N>-<base oid>), so its new merge_group run lands in the same CI concurrency group (ci-${{ github.event.pull_request.number || github.ref }}) as the dead run. cancel-in-progress is true only for pull_request, so the new run QUEUES behind the dead one.

Measured 2026-10-15: run 38693636752 (pr-5369-8f601caff2…, created 06:38:37Z) kept running after #5369's kick; the re-enqueue run 38694775126 (same ref, created 06:49:44Z) sat pending about 31 min.

Fix: cancel-in-progress also true for merge_group. Same ref = same (PR, base) entry, so the newer dispatch always supersedes. Distinct stacked entries have distinct refs and never share a group. pull_request, push, tag and workflow_dispatch behaviour unchanged. A case-table guard (scripts/check_ci_concurrency_cancel.sh) pins all of that and proves the table turns RED on the old expression and on an unconditional true.

done_when: the guard is green on main's ci.yml and its self-test kills both mutants.

Activity

  1. added this to the 0.73.0 milestone on Oct 15, 2026
  2. added
    ready<=200 lines, scoped, verified not done on origin/main; a worker may pull it
    on Oct 18, 2026
  3. noahgift commented on Oct 18, 2026

    @noahgift
    MemberAuthor

    Already on main: 146a632 (#5385). Removed ready; closing left to cop/operator.

  4. added
    P1High priority
    and removed
    ready<=200 lines, scoped, verified not done on origin/main; a worker may pull it
    on Oct 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    P1High priority

    Type

    No type

    Projects

    No projects

      Milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions