Skip to content
This repository was archived by the owner on Aug 24, 2026. It is now read-only.

ci: validate.yml 增 merge_group 触发(P2-7,ADR-0042) - #60

Merged
randypanding merged 1 commit into
mainfrom
p2-7-merge-group-trigger
Aug 20, 2026
Merged

ci: validate.yml 增 merge_group 触发(P2-7,ADR-0042)#60
randypanding merged 1 commit into
mainfrom
p2-7-merge-group-trigger

Conversation

@randypanding

Copy link
Copy Markdown
Contributor

摘要

P2-7(.github#92,ADR-0042):merge queue 的硬性前提——required check workflow 必须订阅 merge_group,否则队列中 check 永不上报、合并直接失败。本仓入列首批队列仓(merge-queue ruleset,.github PR #117)。

非 PR 事件走 main 面校验(validate/simulate/meta-validate);PR 专属步骤(stddiff/adr-required)按既有 if 跳过——ADR 引用已在入队前 PR 面执法。

验证

  • 合并后入队冒烟(gh pr merge --auto 走队列路径)
  • T1 语义冲突拦截(ADR-0042 测试预案)

@coderabbitai

coderabbitai Bot commented Aug 20, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@randypanding, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 13 minutes

Limit details: You’ve used all 10 included reviews currently available.

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

Wait for the limit to reset, then comment @coderabbitai review or push new commits to the PR.

An organization admin can change what happens after included review limits in Billing.

How do review limits work?

CodeRabbit enforces per-developer PR review limits within each organization.

For paid Pro and Pro+ reviews, CodeRabbit uses a developer's included PR review attempts over the past 7 days to set the current hourly allowance. At typical activity levels, the full plan allowance applies. Higher sustained activity can lower the allowance until earlier attempts leave the 7-day window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 89793f65-d062-452e-9acd-b6bcee712a62

📥 Commits

Reviewing files that changed from the base of the PR and between 4951a0e and 30e3182.

📒 Files selected for processing (1)
  • .github/workflows/validate.yml

Comment @coderabbitai help to get the list of available commands.

@qodo-code-review

Copy link
Copy Markdown

PR Summary by Qodo

Enable merge queue validation for the required gate check

🐞 Bug fix ⚙️ Configuration changes 🕐 Less than 10 minutes

Grey Divider

AI Description

• Subscribe the required gate workflow to merge queue checks_requested events.
• Ensure queued merges receive the required check result instead of stalling.
• Reuse main validation while existing PR-only checks remain skipped.
Diagram

sequenceDiagram
    participant MQ as Merge Queue
    participant GH as GitHub Actions
    participant Gate as Gate Job
    participant Val as Main Validators
    MQ->>GH: checks_requested
    GH->>Gate: Start merge_group run
    Gate->>Val: Validate simulate test
    Val-->>Gate: Validation results
    Gate-->>GH: Gate status
    GH-->>MQ: Required check result
Loading
High-Level Assessment

The PR uses GitHub’s required native merge_group: checks_requested integration and reuses the existing non-PR validation path. A separate merge-queue workflow was considered but would duplicate validation configuration and risk diverging required-check behavior.

Files changed (1) +4 / -0

Other (1) +4 / -0
validate.ymlTrigger the gate workflow for merge queue checks +4/-0

Trigger the gate workflow for merge queue checks

• Adds the 'merge_group' trigger for 'checks_requested', allowing the required 'gate' check to run and report during merge queue processing. Existing event guards route these runs through main validation and continue skipping PR-specific steps.

.github/workflows/validate.yml

@randypanding
randypanding merged commit 587d6bc into main Aug 20, 2026
11 checks passed
@randypanding
randypanding deleted the p2-7-merge-group-trigger branch August 20, 2026 06:07
@qodo-code-review

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Grey Divider

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Grey Divider

Tip of the day
💡 Did you know, you can copy the agent prompt from any finding and feed it to your IDE agent

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

Grey Divider

Qodo Logo

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant