Skip to content

ci: run the required checks on merge groups - #706

Merged
devantler merged 1 commit into
mainfrom
claude/ci-merge-group-704
Nov 14, 2026
Merged

devantler merged 1 commit into
mainfrom
claude/ci-merge-group-704

Conversation

@devantler

Copy link
Copy Markdown
Contributor

Why

#704 replaces recheck-open-prs with a merge queue. The queue waits for CI - Required Checks on every merge group, so CI must start on merge_group before the queue ruleset is turned on. Otherwise queued PRs wait for a check that never starts.

What

  • ci.yaml also runs on merge_group. Group refs are unique, so the existing ref-keyed concurrency never cancels one group for another.
  • The version-bump gate diffs against merge_group.base_sha in a group, so it checks exactly what the group adds to main.
  • PR-only steps (bundled-skill edit guard, marketplace proposal) stay PR-only. They have already passed on the PR before it can join the queue.

Order

  1. This PR.
  2. The ruleset in devantler-tech/.github (deploy/repository-rulesets/require-merge-queue-on-agent-plugins.yaml).
  3. A follow-up PR here deletes recheck-open-prs once the queue is live. That one closes Replace recheck-open-prs with a merge queue #704.

Validation

  • actionlint clean.
  • ci-script-test-sharding-workflow, ci-skill-validation-workflow, guard-bundled-skill-edits and prepare-merged-marketplace-release self-tests pass.

Part of #704.

🤖 Generated with Claude Code

Prepares the merge queue that replaces recheck-open-prs
(#704): the queue waits for CI - Required Checks on each group, so
CI must start on merge_group before the ruleset is active. The version
bump gate diffs against the group's base.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@devantler

Copy link
Copy Markdown
Contributor Author

@coderabbitai review

@coderabbitai

coderabbitai Bot commented Nov 14, 2026 •

Copy link
Copy Markdown
Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@coderabbitai

coderabbitai Bot commented Nov 14, 2026

Copy link
Copy Markdown

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

The CI workflow now runs for merge-group events targeting main. The plugin version-bump check uses the pull request base SHA when available. Otherwise, it uses the merge group’s base_sha before falling back to github.event.before.

Merge Risk: Minimal · up to 1d26f

This change lets the required CI checks run for merge-queue groups, with the version-bump check diffing against the group's base commit. No concrete defect was established, and a revert would restore the old behavior.

Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

Failed Failed checks: 1 inconclusive

Check name Status Explanation Resolution
Linked Issues check Inconclusive Linked issue #704 is open and directly linked. Its first step has two parts. (1) Add the merge-queue ruleset through the devantler-tech/.github manifests. That work is in another repository and is not… Provide the full ci.yaml content at the reviewed head, or a readable diff against the merge base. Confirm that the CI - Required Checks job runs on merge_group events, without a skip condition that excludes them, and that the version-bump g…
Passed Passed checks: 3 passed

Check name Status Explanation
Title check Passed The title "ci: run the required checks on merge groups" matches the main change. The ci.yaml workflow now runs on merge_group events targeting main, and the version-bump check uses merge_group base_sh…
Description check Passed The description explains why (preparing for a merge queue that waits on CI - Required Checks for merge groups), what changed (ci.yaml runs on merge_group, the version-bump gate diffs against merge_gro…
Out of Scope Changes check Passed The readable part of ci.yaml at the reviewed head shows only merge-queue related edits. These are the merge_group trigger, with a comment that cites #704, and a concurrency comment that explains why u…
Full details: Title check

Explanation

The title "ci: run the required checks on merge groups" matches the main change. The ci.yaml workflow now runs on merge_group events targeting main, and the version-bump check uses merge_group base_sha. The title is specific and follows a conventional commit prefix.

Full details: Description check

Explanation

The description explains why (preparing for a merge queue that waits on CI - Required Checks for merge groups), what changed (ci.yaml runs on merge_group, the version-bump gate diffs against merge_group.base_sha, PR-only steps stay PR-only), the rollout order, and validation steps. It relates directly to the changeset.

Full details: Out of Scope Changes check

Explanation

The readable part of ci.yaml at the reviewed head shows only merge-queue related edits. These are the merge_group trigger, with a comment that cites #704, and a concurrency comment that explains why unique merge_group refs do not cancel each other. The raw summary reports +7/-1 lines. It also reports a version-bump gate change that uses merge_group.base_sha before github.event.before. That gate change is part of the PR description and relates to merge-group CI. The PR-only steps (bundled-skill guard, marketplace proposal) are not shown as changed. No unrelated file changes appear in the supplied evidence. The gate hunk was verified only by the summary, because the full diff could not be read.

Full details: Linked Issues check

Explanation

Linked issue #704 is open and directly linked. Its first step has two parts. (1) Add the merge-queue ruleset through the devantler-tech/.github manifests. That work is in another repository and is not in this PR. The PR says so and orders it as step 2. (2) Confirm required checks run on merge_group. In this repo, the reviewed head of .github/workflows/ci.yaml adds a merge_group trigger, with comments tied to #704. The version-bump gate hunk (merge_group.base_sha fallback) and the CI - Required Checks job definition were not readable. The diff read failed, and the file read was truncated at 16000 bytes. So the job name, its absence of a merge_group skip condition, and the gate logic remain unverified from source. Deleting recheck-open-prs is a later step and is not expected here.

Resolution

Provide the full ci.yaml content at the reviewed head, or a readable diff against the merge base. Confirm that the CI - Required Checks job runs on merge_group events, without a skip condition that excludes them, and that the version-bump gate uses merge_group.base_sha in merge groups. Ruleset enablement in devantler-tech/.github is outside this PR and needs no check here.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

Recent review info

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: ASSERTIVE
  • Plan: Advanced
  • Run ID: bd407256-1f25-44c0-84de-0b0fa308d45b
Commits

Reviewing files that changed from the base of the PR and between e7ba7bf and 1d26f53.

Files selected for processing: 1

  • .github/workflows/ci.yaml

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

Recent review details

Additional context used

Learnings: 1

Common learnings

Learnt from: CR
Repo: devantler-tech/agent-plugins PR: 0
File: docs/validation.md:0-0
Timestamp: 2026-11-11T06:40:23.312Z
Learning: Applicability reference:
AGENTS.md: # devantler-tech/agent-plugins
## Validation
Run before opening any PR, and never weaken a check to pass — fix the root cause. The required gate
is the aggregated **`CI - Required Checks`** job. Every validation command, what each check
observes, and how a new gate reaches pull requests that are already open are in
[docs/validation.md](docs/validation.md): **read it before validating a change, or adding or
altering a CI job.** Every change starts with:

AGENTS.md: # devantler-tech/agent-plugins
## Agent guides
| Guide | Read it before |
|---|---|
| [docs/validation.md](docs/validation.md) | validating a change, opening a PR, or adding or altering a CI job |

AGENTS.md: # devantler-tech/agent-plugins
## Maintenance (autonomous AI engineer)
**Validate before any PR:** run the steps in [docs/validation.md](docs/validation.md) (`./scripts/validate-manifests.sh`,
spec-validate each skill, `actionlint` changed workflows). No app build here — manifest parit...
Additional comments: 1

.github/workflows/ci.yaml: 1

433-433: Data Integrity & Integration

The concern does not hold for the merge-group base. Each later group is built on the group ahead of it, so its merge_group.base_sha (the parent commit) includes the earlier PR's version bump. A second PR that also bumps 1.0→1.1 is then compared against 1.1 and fails the gate. The described pass, where the second group is checked against the original main commit, is not supported by the documented group construction or the base_sha definition.

@devantler
devantler marked this pull request as ready for review November 14, 2026 19:19
@devantler
devantler merged commit bd28c81 into main Nov 14, 2026
24 checks passed
@devantler
devantler deleted the claude/ci-merge-group-704 branch November 14, 2026 19:19
@github-project-automation github-project-automation Bot moved this from 🫴 Ready to ✅ Done in 🌊 Project Board Nov 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

Replace recheck-open-prs with a merge queue

1 participant