From 3a6d9be77ba28f1be7dc4a57b399b5d98ecd1f43 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sun, 1 Nov 2026 23:51:46 -0800 Subject: [PATCH] ci(queue): a dispatch on main reports Queue on a PR's head A dispatch reads queue.yml from the ref it runs on, so dispatching on an old PR branch is refused. A dispatch on main now takes the PR head's SHA and creates the skipped Queue check run there with the workflow's own token (the GitHub Actions app the ruleset pins), with only checks: write and no checkout. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/queue.yml | 33 +++++++++++++++++++++++++++++---- sh/gh/queue.test.ts | 7 +++++-- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.github/workflows/queue.yml b/.github/workflows/queue.yml index 925431dfcbc..dc55e61547e 100644 --- a/.github/workflows/queue.yml +++ b/.github/workflows/queue.yml @@ -17,11 +17,16 @@ on: types: [opened, synchronize, reopened, edited] merge_group: types: [checks_requested] - # Reports the skipped context on a branch's head without a pull_request - # event. A PR whose test merge commit predates this workflow gets no - # pull_request run from it (GitHub runs PR workflows from that commit), so - # `gh workflow run queue.yml --ref ` gives it the context. + # Reports the skipped context on a PR's head without a pull_request event. + # A PR whose test merge commit predates this workflow gets no pull_request + # run from it (GitHub runs PR workflows from that commit, and a dispatch reads + # the workflow from the ref it runs on), so + # `gh workflow run queue.yml -f sha=` on main reports it there. workflow_dispatch: + inputs: + sha: + description: The PR head commit to report the skipped Queue context on. + required: true permissions: contents: read @@ -74,3 +79,23 @@ jobs: path: target/cargo-timings/cargo-timing-*.html if-no-files-found: ignore retention-days: 14 + + # The merge queue still builds every group with the job above; this only + # satisfies the PR-side requirement, as a pull_request run's skipped job does. + report: + name: Report Queue + if: github.event_name == 'workflow_dispatch' + runs-on: ubuntu-latest + timeout-minutes: 5 + permissions: + checks: write + steps: + - name: Report the skipped Queue context + env: + GH_TOKEN: ${{ github.token }} + REPO: ${{ github.repository }} + SHA: ${{ inputs.sha }} + run: | + [[ "$SHA" =~ ^[0-9a-f]{40}$ ]] || { echo "::error::sha must be a full commit SHA" >&2; exit 1; } + gh api "repos/$REPO/check-runs" -f name=Queue -f head_sha="$SHA" -f status=completed -f conclusion=skipped \ + -f 'output[title]=Queue' -f 'output[summary]=Skipped on the pull request; the merge queue builds the group.' --silent diff --git a/sh/gh/queue.test.ts b/sh/gh/queue.test.ts index 274edac4667..35607d74995 100644 --- a/sh/gh/queue.test.ts +++ b/sh/gh/queue.test.ts @@ -46,8 +46,11 @@ assert.equal(await Bun.file(".github/workflows/land.yml").exists(), false, "no w // host's runner, read-only and without secrets. const queue = await workflow("queue"); assert.deepEqual(queue.on.merge_group, { types: ["checks_requested"] }); -// A dispatch only reports the skipped context on a branch head. -assert.ok("workflow_dispatch" in queue.on); +// A dispatch only reports the skipped context on a PR head, with nothing but `checks: write`. +assert.ok(queue.on.workflow_dispatch.inputs.sha.required); +assert.equal(queue.jobs.report.if, "github.event_name == 'workflow_dispatch'"); +assert.deepEqual(queue.jobs.report.permissions, { checks: "write" }); +assert.equal(queue.jobs.report.steps.length, 1, "the report job checks nothing out and runs no code from a PR"); assert.deepEqual(queue.on.pull_request.branches, ["main"]); assert.ok(queue.on.pull_request.types.includes("edited"), "retargeting to main must report the context"); assert.equal(queue.on.pull_request.paths, undefined, "the required context must always report");