Skip to content

Commit a91f241

Browse files
committed
ci: add merge_group trigger to satisfy required checks in merge queue
Branch rules require contexts 'Conventional Commit Title', 'Python Lint & Test', and 'Pattern Validation'. ci.yml and pr-lint.yml only fired on pull_request, so PRs entering the merge queue stalled at AWAITING_CHECKS on the merge-group SHA (#523). Changes: - ci.yml: add merge_group trigger (branches: [main]) — satisfies the 'Python Lint & Test' and 'Pattern Validation' required contexts - pr-lint.yml: add merge_group trigger (branches: [main]); gate the amannn/action-semantic-pull-request step to pull_request only via an 'if:' condition; add a no-op echo step for merge_group so the 'Conventional Commit Title' context is reported as succeeded (PR title was already validated before queue entry) No new actions, no new permissions, no new secrets access. All existing pinned SHA references preserved. Closes #523 Co-authored-by: OpenCode Agent <[email protected]>
1 parent f3c6acb commit a91f241

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
branches: [main]
88
pull_request:
99
branches: [main]
10+
merge_group:
11+
branches: [main]
1012

1113
concurrency:
1214
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

‎.github/workflows/pr-lint.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: PR Lint
33
on:
44
pull_request:
55
types: [opened, edited, synchronize]
6+
merge_group:
7+
branches: [main]
68

79
concurrency:
810
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -16,7 +18,16 @@ jobs:
1618
name: Conventional Commit Title
1719
runs-on: ubuntu-latest
1820
steps:
19-
- uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
21+
# On merge_group the PR object is absent; emit a pass so the required
22+
# context is satisfied. The title was already validated when the PR
23+
# entered the queue.
24+
- name: Skip title check (merge_group)
25+
if: github.event_name == 'merge_group'
26+
run: echo "merge_group event — PR title already validated; skipping."
27+
28+
- name: Validate conventional commit title (pull_request)
29+
if: github.event_name == 'pull_request'
30+
uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
2031
env:
2132
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2233
with:

0 commit comments

Comments
 (0)