From 29747f5d6b77db27b48281bee554dc66628c9c5e Mon Sep 17 00:00:00 2001 From: Paul Rastoin <45004772+prastoin@users.noreply.github.com> Date: Fri, 24 Jul 2026 15:18:26 +0200 Subject: [PATCH] ci: report required status checks on merge_group so the queue isn't blocked (#23275) Follow-up to #23216, which added the `merge_group`-triggered `upgrade-mutation-guard`. This makes the merge queue actually usable. ## Why The merge queue waits for every **required status check** to report a conclusion on the `merge_group` candidate commit, and there is no queue-only subset: it uses the branch's required status checks. Our required `ci-*-status-check` contexts only trigger on `pull_request`, so on a queued PR they sit at "Expected - Waiting for status to be reported" and block the queue until the status-check timeout (60 min), which then counts them as failed. Only `upgrade-mutation-guard` (from #23216) triggers on `merge_group`, so today it is the only check that reports in the queue. ## What Add a `merge_group` trigger to each of the seven required-check workflows and short-circuit the expensive work so the check reports success in seconds, while the full suite keeps running on `pull_request` to gate PRs. `upgrade-mutation-guard` stays the only check the queue genuinely validates against `main`. Mechanism: on `merge_group` the root jobs skip, everything downstream cascades to `skipped`, and the `always()`-gated `*-status-check` job runs, sees no failing needs, and succeeds. Kept as the same job in the same workflow so the required-check context is byte-identical to the PR-level one (a separate pass-through workflow could register a different context and not satisfy branch protection). Per workflow: - **ci-front**: trigger only. It already cascades - `changed-files-check` is `pull_request`-only and `front-sb-build` gates on `push || any_changed`, so nothing runs on `merge_group`. - **ci-server**: trigger + `if: github.event_name != 'merge_group'` on the three ungated root jobs (`changed-files-check`, `upgrade-changed-files-check`, `server-previous-version-upgrade-mutation-guard`). The guard would otherwise fail on `merge_group` since `pull_request.base.sha` is empty there; the queue-side guard in `ci-merge-queue.yaml` already covers that case. - **ci-sdk / ci-website / ci-test-docker-compose**: trigger + the same guard on `changed-files-check`. - **ci-twenty-apps**: trigger + the guard on `discover` (its `ci`/`integration` jobs gate on `discover` output, so they cascade off). ## Settings note This complements the branch-protection changes for the queue (enable the queue, max group size 1, per #23216). If the branch has **other** required checks beyond these seven whose workflows are `pull_request`-only, they need the same `merge_group` treatment or the queue will wait on them too. --- _Generated by [Claude Code](https://claude.ai/code/session_015mZozbvyvha1S6wsEVLBnF)_ Review in cubic --- .github/workflows/ci-front.yaml | 1 + .github/workflows/ci-sdk.yaml | 2 ++ .github/workflows/ci-server.yaml | 4 ++++ .github/workflows/ci-test-docker-compose.yaml | 2 ++ .github/workflows/ci-twenty-apps.yaml | 2 ++ .github/workflows/ci-website.yaml | 2 ++ 6 files changed, 13 insertions(+) diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml index 2de139148e..abe92642f3 100644 --- a/.github/workflows/ci-front.yaml +++ b/.github/workflows/ci-front.yaml @@ -2,6 +2,7 @@ name: CI Front on: pull_request: + merge_group: push: branches: [main] diff --git a/.github/workflows/ci-sdk.yaml b/.github/workflows/ci-sdk.yaml index cbb48449d1..938161b8c7 100644 --- a/.github/workflows/ci-sdk.yaml +++ b/.github/workflows/ci-sdk.yaml @@ -2,6 +2,7 @@ name: CI SDK on: pull_request: + merge_group: permissions: contents: read @@ -12,6 +13,7 @@ concurrency: jobs: changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml index 5332c5d8e4..388a67301d 100644 --- a/.github/workflows/ci-server.yaml +++ b/.github/workflows/ci-server.yaml @@ -2,6 +2,7 @@ name: CI Server on: pull_request: + merge_group: permissions: contents: read @@ -15,6 +16,7 @@ env: jobs: changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | @@ -29,6 +31,7 @@ jobs: packages/twenty-shared/** upgrade-changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | @@ -90,6 +93,7 @@ jobs: tasks: lingui:compile server-previous-version-upgrade-mutation-guard: + if: github.event_name != 'merge_group' timeout-minutes: 5 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ci-test-docker-compose.yaml b/.github/workflows/ci-test-docker-compose.yaml index ac9366b6a7..28a6346049 100644 --- a/.github/workflows/ci-test-docker-compose.yaml +++ b/.github/workflows/ci-test-docker-compose.yaml @@ -5,6 +5,7 @@ permissions: on: pull_request: + merge_group: concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -12,6 +13,7 @@ concurrency: jobs: changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | diff --git a/.github/workflows/ci-twenty-apps.yaml b/.github/workflows/ci-twenty-apps.yaml index c59efbbd1b..a50c115553 100644 --- a/.github/workflows/ci-twenty-apps.yaml +++ b/.github/workflows/ci-twenty-apps.yaml @@ -5,6 +5,7 @@ on: branches: - main pull_request: + merge_group: workflow_dispatch: inputs: application: @@ -22,6 +23,7 @@ concurrency: jobs: discover: + if: github.event_name != 'merge_group' uses: ./.github/workflows/discover-apps.yaml with: scope: internal-and-public diff --git a/.github/workflows/ci-website.yaml b/.github/workflows/ci-website.yaml index 8159893507..51f14f224f 100644 --- a/.github/workflows/ci-website.yaml +++ b/.github/workflows/ci-website.yaml @@ -2,6 +2,7 @@ name: CI Website on: pull_request: + merge_group: permissions: contents: read @@ -12,6 +13,7 @@ concurrency: jobs: changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: |