From e016381a8fa9f64b1cc6b2868cde78e64ac1bd5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Thu, 13 Aug 2026 18:32:06 -0300 Subject: [PATCH 1/2] ci: subscribe CI to merge_group events A merge queue runs required checks against a temporary `gh-readonly-queue/*` branch and reports a workflow as passing only if that workflow subscribes to the `merge_group` event. Lint and Test are required checks, so without this trigger the queue would sit waiting on checks that never start. merge_group runs carry no `head_ref`, so the concurrency group falls back to the unique `run_id` and queue runs are never cancelled by a sibling run. --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c472fd7e..11a90f81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,16 @@ on: branches: [main] pull_request: branches: ["**"] + # Required for Lint and Test to run against the merge queue's temporary + # branch. A merge queue only reports a check as passing if the workflow + # subscribes to merge_group; without it the queue waits forever on checks + # that never start. + merge_group: workflow_dispatch: -# Cancel in-progress runs when a new commit is pushed to the same PR or branch +# Cancel in-progress runs when a new commit is pushed to the same PR or branch. +# merge_group runs have no head_ref, so they fall back to the unique run_id and +# are never cancelled by a sibling run. concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true From 29a45e1b3b1054bf436a6b2a7e895d7c261ebe23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Thu, 13 Aug 2026 18:38:03 -0300 Subject: [PATCH 2/2] refactor: remove superfluous comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Tomás Grüner <47506558+MegaRedHand@users.noreply.github.com> --- .github/workflows/ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11a90f81..50dc0765 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,16 +5,10 @@ on: branches: [main] pull_request: branches: ["**"] - # Required for Lint and Test to run against the merge queue's temporary - # branch. A merge queue only reports a check as passing if the workflow - # subscribes to merge_group; without it the queue waits forever on checks - # that never start. merge_group: workflow_dispatch: -# Cancel in-progress runs when a new commit is pushed to the same PR or branch. -# merge_group runs have no head_ref, so they fall back to the unique run_id and -# are never cancelled by a sibling run. +# Cancel in-progress runs when a new commit is pushed to the same PR or branch concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true