From f7f91745f8d816879dd9b9e5e155b78ea39c03d7 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 12 Jun 2026 10:27:25 -0400
Subject: [PATCH] ci: Enable merge queue support

Add the merge_group event trigger so CI runs when a pull request
enters the GitHub merge queue. Also update the required-checks sentinel
to use the standard jq success-or-skipped pattern so that jobs
intentionally skipped in some contexts do not block the queue.

xref: https://github.com/bootc-dev/infra/issues/143

Assisted-by: OpenCode (Claude Sonnet 4.6)
Signed-off-by: Colin Walters <walters@verbum.org>
---
 .github/workflows/ci.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3769bca..8f35177a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
     branches: [master, main]
   pull_request:
     branches: [master, main]
+  merge_group:
 
 env:
   CARGO_TERM_COLOR: always
@@ -126,13 +127,14 @@ jobs:
     if: always()
     needs: [test, wasm, rustfmt, semver-checks, revdep, publish_docs]
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     steps:
-      - run: exit 1
-        if: >-
-          needs.test.result != 'success' ||
-          needs.wasm.result != 'success' ||
-          needs.rustfmt.result != 'success' ||
-          needs.semver-checks.result != 'success' ||
-          needs.revdep.result != 'success' ||
-          needs.publish_docs.result != 'success'
+      - name: Check all jobs
+        env:
+          NEEDS: ${{ toJson(needs) }}
+        run: |
+          FAILED=$(echo "$NEEDS" | jq -r 'to_entries[] | select(.value.result | IN("success","skipped") | not) | .key')
+          if [ -n "$FAILED" ]; then
+            echo "The following jobs did not succeed: $FAILED"
+            exit 1
+          fi
+          echo "All jobs succeeded or were skipped."