Skip to content

Commit 749e7c8

Browse files
committed
ci: trigger CI on merge_group so the merge queue can complete
The repository's default-branch ruleset requires the GitHub Merge Queue, and requires this workflow's Integration and Protocol test jobs as status checks. The queue runs checks against temporary gh-readonly-queue/main/* branches, which only trigger workflows that opt in via the merge_group event. This workflow only had push and pull_request triggers, so no run ever started for queued entries — they sat in AWAITING_CHECKS indefinitely, waiting on required checks that could never execute. Also extend test-integration-cloud-serverless's forked-PR guard to allow merge_group events. Without this, adding the trigger above would make the job run but immediately evaluate its `if` to false and report skipped — still leaving one of the three required checks permanently unsatisfied on queue runs.
1 parent 1c0fc2f commit 749e7c8

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [main]
66
pull_request:
77
branches: [main]
8+
merge_group:
89
workflow_dispatch:
910

1011
jobs:
@@ -123,9 +124,12 @@ jobs:
123124
runs-on: ubuntu-latest
124125
# Skip on forked PRs — environment secrets (INFLUXDB_CLOUD_URL/TOKEN) are
125126
# not exposed to fork runs, which would fail on empty credentials.
127+
# merge_group runs only happen for same-repo branches that already
128+
# cleared review, so they're always safe to include here.
126129
if: |
127130
github.repository_owner == 'influxdata' &&
128131
(github.event_name == 'push' ||
132+
github.event_name == 'merge_group' ||
129133
github.event.pull_request.head.repo.full_name == github.repository)
130134
environment: cloud-serverless
131135
steps:

0 commit comments

Comments
 (0)