Skip to content

feat(workflow-templates): add merge_group trigger for GitHub merge queue - #163

Merged
williaby merged 5 commits into
mainfrom
claude/issue-154-merge-group-trigger-0
May 25, 2026
Merged

williaby merged 5 commits into
mainfrom
claude/issue-154-merge-group-trigger-0

Conversation

@williaby

@williaby williaby commented May 25, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

  • Adds unfiltered merge_group: trigger to nine workflow templates so GitHub merge queue can satisfy required-status-check policies on consumer repos:
    • workflow-templates/python-ci.yml
    • workflow-templates/python-cifuzzy.yml
    • workflow-templates/python-compatibility.yml
    • workflow-templates/python-container-security.yml
    • workflow-templates/python-docs.yml
    • workflow-templates/python-fips-compatibility.yml
    • workflow-templates/python-reuse.yml
    • workflow-templates/python-security-analysis.yml
    • workflow-templates/python-sonarcloud.yml
  • The trigger is purely additive and inert until a consumer repo enables merge_queue in its branch ruleset, so this is safe to land before any rollout.
  • workflow-templates/python-pr-validation.yml is intentionally excluded because the reusable workflow it calls (.github/workflows/python-pr-validation.yml) is deprecated (header says "WILL BE REMOVED IN A FUTURE RELEASE", recommends migrating to python-ci.yml).
  • Includes Copilot review remediation: hardened detect-changes job (timeout + harden-runner) in python-security-analysis.yml, added harden-runner to sonarcloud job in python-sonarcloud.yml, and documented dependency-review-action's lack of merge_group support as a known limitation with a follow-up note for osv-scanner-on-merge_group coverage.

Why

From #154: when a fleet of compatible Renovate PRs auto-merges serially, GitHub cascades rebases at N(N+1)/2 CI runs per N PRs. Enabling merge queue collapses that to 1..N runs by batching against a single speculative HEAD. The queue can only verify required status checks if those workflows actually emit on the merge_group event, so the template gap is the prerequisite for issue #154's rollout.

Standards manifest cross-reference

CI-040 (severity: suggested) in docs/standards-manifest.yaml already requires .github/workflows/ci.yml to respond to merge_group. The current note says the check is override-eligible while the trigger is missing from templates. This PR closes that gap for the nine PR-gate templates. A follow-up PR in the ~/.claude/ repo will:

  • Add CI-062 (severity: important) for repos with auto-merge enabled, requiring queue enablement on the main ruleset.
  • Promote CI-040 from suggested to important after templates propagate to consumers (~24h Renovate cycle).

RAD compliance

All nine templates carry a #CRITICAL tag on the new merge_group: trigger. The full #VERIFY procedure is documented inline in python-ci.yml; the other eight templates carry a one-line pointer to that procedure to satisfy CLAUDE.md's "#CRITICAL must be paired with #VERIFY" rule without duplicating the verification text nine times.

Test plan

  • After merge, wait for Renovate to roll the templates into homelab-infra (or push manually for validation).
  • Enable merge_queue on homelab-infra main ruleset via API.
  • Queue 2+ trivial Renovate PRs and confirm the merge_group ref produces check runs named "CI Gate", "Security Analysis / ...", and "SonarCloud / ..." via gh api repos/ByronWilliamsCPA/homelab-infra/commits/<sha>/check-runs.
  • Confirm queue lands batched PRs with a single CI cycle, recorded as a comment on Enable GitHub merge_queue for repos with auto-merging dep bumps #154.

Refs #154

Generated with Claude Code

Add unfiltered merge_group: trigger to python-ci.yml, python-security-
analysis.yml, and python-sonarcloud.yml so the queue's speculative merge
commit produces the same required status checks that PRs do.

Without this, repos that enable merge_queue cannot land PRs that list
these workflows as required status checks. The trigger is inert until
merge_queue is enabled in the repo's branch ruleset (see CI-040).

python-pr-validation.yml is intentionally excluded because the reusable
workflow it calls is deprecated and slated for removal.

Refs #154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings May 25, 2026 22:47
@coderabbitai

coderabbitai Bot commented May 25, 2026 •

Copy link
Copy Markdown

Warning

Review limit reached

@williaby, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 52 minutes and 55 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: b69f899a-bb44-4254-afb0-a9d93955e9e7

📥 Commits

Reviewing files that changed from the base of the PR and between 7fdf943 and 234e5ca.

📒 Files selected for processing (10)
  • CHANGELOG.md
  • workflow-templates/python-ci.yml
  • workflow-templates/python-cifuzzy.yml
  • workflow-templates/python-compatibility.yml
  • workflow-templates/python-container-security.yml
  • workflow-templates/python-docs.yml
  • workflow-templates/python-fips-compatibility.yml
  • workflow-templates/python-reuse.yml
  • workflow-templates/python-security-analysis.yml
  • workflow-templates/python-sonarcloud.yml
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/issue-154-merge-group-trigger-0

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

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

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the org’s reusable GitHub Actions workflow templates to support GitHub merge queue by adding the merge_group event trigger, so required status checks can be produced for speculative merge commits in consumer repositories.

Changes:

  • Add merge_group: trigger to the Python CI workflow template.
  • Add merge_group: trigger to the Python Security Analysis workflow template.
  • Add merge_group: trigger to the Python SonarCloud workflow template.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File Description
workflow-templates/python-ci.yml Adds merge_group trigger so CI required checks can run for merge queue refs.
workflow-templates/python-security-analysis.yml Adds merge_group trigger so security checks can run for merge queue refs.
workflow-templates/python-sonarcloud.yml Adds merge_group trigger so SonarCloud analysis can run for merge queue refs.

Comment on lines +30 to +33
# CRITICAL: merge_group fires against the queue's speculative merge commit.
# Security gate must run on the queue ref so vulnerabilities introduced by
# the speculative merge are caught before landing on main. See CI-040.
merge_group:
Comment on lines +30 to +33
# CRITICAL: merge_group fires against the queue's speculative merge commit.
# Security gate must run on the queue ref so vulnerabilities introduced by
# the speculative merge are caught before landing on main. See CI-040.
merge_group:
Comment on lines +27 to +30
# CRITICAL: merge_group fires against the queue's speculative merge commit.
# SonarCloud quality gate must run on the queue ref to prevent regressions
# that only surface when concurrent PRs are merged together. See CI-040.
merge_group:
@williaby

Copy link
Copy Markdown
Collaborator Author

PR Review

Status: CI green (23/23), SonarCloud quality gate PASSED (0 new issues, 0 hotspots). CodeRabbit rate-limited (org out of credits); Copilot not auto-requested.

Agent findings: 0 Critical / 1 Important / 2 Suggested / 2 Informational.


Important (should fix)

  • [CLAUDE.md] CHANGELOG.md not updated for a feat(workflow-templates): commit. The CHANGELOG preamble explicitly covers shared workflow templates, so this addition belongs under [Unreleased] / ### Added. Add a one-line entry naming the three templates that gained merge_group: triggers and reference issue Enable GitHub merge_queue for repos with auto-merging dep bumps #154.

Suggested (consider addressing)

  • [Architecture] workflow-templates/python-security-analysis.yml: the detect-changes job (line 42) uses dorny/paths-filter to gate four downstream jobs. paths-filter resolves its base via event context; on merge_group events the base is the queue parent commit. #VERIFY during the Test plan step 2 (queue rollout on homelab-infra) that security jobs run rather than silently skipping. If they skip, gate the filter on pull_request events only and unconditionally run security jobs on merge_group.

  • [Scope] This PR covers 3 templates and excludes python-pr-validation.yml (deprecated, justified). However python-compatibility.yml, python-fips-compatibility.yml, python-mutation.yml, and python-release.yml still lack merge_group:. If consumer repos list any of those as required checks under a merge_queue-enabled ruleset, those PRs will wedge in the queue. Consider expanding scope or filing a tracking issue so the Enable GitHub merge_queue for repos with auto-merging dep bumps #154 rollout doesn't surface this gap one template at a time.

Informational

  • Inline comments cite standards-manifest CI-040 but grep CI-040 at HEAD returns nothing in docs/standards-manifest.yaml. Either add the entry or correct the citation (it may live in the ~/.claude/ standards manifest).
  • python-ci.yml concurrency.group: ci-${{ github.ref }} uses different ref namespaces between events; queue runs won't cancel stale PR runs. This is correct behavior for merge queues, just noting for future readers.

Recommended Action

  1. Add ### Added CHANGELOG entry (required by CLAUDE.md feat-commit rule).
  2. Verify paths-filter behavior on merge_group during Test plan step 2.
  3. Resolve the CI-040 citation (add to manifest or update comments).
  4. Track follow-on coverage for the remaining python-*.yml templates.

CodeRabbit review request failed (rate limit); rerun via @coderabbitai review in ~16 minutes.

Generated with Claude Code

@coderabbitai

coderabbitai Bot commented May 25, 2026

Copy link
Copy Markdown

@williaby Thanks for the detailed agent-generated summary! I'll kick off a full review now. A few of the flagged items align with things I'll specifically look at:

  • CHANGELOG gap — I'll verify the [Unreleased] section and whether a feat: entry is expected per your CLAUDE.md conventions.
  • paths-filter on merge_group — I'll check python-security-analysis.yml to assess whether the detect-changes guard could silently skip security jobs in a queue context.
  • Remaining templates — I'll flag which other python-*.yml templates are missing merge_group: so you can decide whether to expand scope or file a tracking issue.
  • CI-040 citation — I'll check docs/standards-manifest.yaml for the entry.
✅ Actions performed

Review triggered.

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.

williaby and others added 2 commits May 25, 2026 15:58
…templates

Extends the merge_group: trigger rollout (initial 3 templates landed in the
same PR) to the remaining PR-gated workflow templates so consumer repos
can satisfy required-status-check policies under merge_queue regardless
of which template they list as required:

- python-cifuzzy.yml
- python-compatibility.yml
- python-container-security.yml
- python-docs.yml
- python-fips-compatibility.yml
- python-reuse.yml

For templates that gate push/pull_request on paths: filters (container-
security, docs, fips-compatibility), the merge_group: trigger is added
without a paths: filter. The queue's speculative merge ref reflects a
full merge from base, so path-based skipping is unreliable on the queue
ref; running unconditionally on merge_group: ensures the required check
emits even when no path-filtered file changed.

python-pr-validation.yml remains intentionally excluded (deprecated, slated
for removal per the existing PR scope decision).

Refs #154

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Adds a single Unreleased / Added entry covering the merge_group: trigger
rollout to all 9 PR-gated workflow templates (3 from the original PR
scope + 6 expanded in the prior commit). The entry summarizes the
required-status-check rationale, notes the additive/inert nature of the
trigger, and explains the python-pr-validation.yml exclusion.

Required by CLAUDE.md: feat/fix/perf/breaking commits update CHANGELOG.md.

Refs #154

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@williaby

Copy link
Copy Markdown
Collaborator Author

PR Fix Summary

Addressed pr-review findings; pushed 2 commits.

Important (resolved)

  • CHANGELOG.md: added ### Added entry under [Unreleased] covering all 9 templates. Fixed in d5613e8.

Suggested (resolved, expanded scope per maintainer decision)

  • Scope expansion: added merge_group: to the 6 remaining PR-gated templates (python-cifuzzy.yml, python-compatibility.yml, python-container-security.yml, python-docs.yml, python-fips-compatibility.yml, python-reuse.yml). For the three templates with paths: filters, the merge_group: trigger was added without a paths: filter (the queue's speculative merge ref reflects a full merge, so path-based skipping is unreliable on the queue ref; running unconditionally ensures the required check emits). Fixed in 2802db5.
  • paths-filter behavior on merge_group: noted in pr-review as a Suggested verification item; this is the PR's own #VERIFY tag and is handled by Test plan step 2. No code change needed pre-merge.

Informational (dismissed)

  • CI-040 reference: pr-review flagged this as not found in this repo's manifest. Verified that CI-040 lives in ~/.claude/docs/standards-manifest.yaml:1018 (which is where the comments intentionally point per the planned multi-PR rollout in that repo). False positive; no action.
  • concurrency block note: informational only; current behavior is correct for queue refs.

Pre-commit local check: clean (yamllint, markdownlint, no-em-dash, detect-secrets, trufflehog, commitizen).
Actionlint: not installed locally; deferred to CI (Lint workflow files (actionlint)).

CI re-run triggered by push. CodeRabbit was rate-limited on the original push; trigger a fresh review via @coderabbitai review once credits reset.

🤖 Generated with Claude Code

@coderabbitai

coderabbitai Bot commented May 25, 2026

Copy link
Copy Markdown

@williaby: Excellent — thorough and well-documented fix summary. Here's a quick acknowledgment of each item before I kick off the incremental review:

Finding Disposition Notes
CHANGELOG ### Added entry ✅ Resolved (d5613e8) Covers all 9 templates
Scope expansion (6 remaining templates) ✅ Resolved (2802db5) Smart call to drop paths: filter on merge_group: — unconditional emit is the right pattern for queue refs
paths-filter on merge_group 🔲 Deferred to Test plan step 2 Appropriate — this is a runtime validation item
CI-040 citation ✅ Dismissed Origin in ~/.claude/ manifest confirmed; false positive
Concurrency block ℹ️ No action Correct behavior documented

The rationale for running merge_group unconditionally (avoiding path-based skipping on the speculative merge ref) is sound and worth capturing as a pattern for future templates.

Triggering a fresh incremental review against the two new commits now.

✅ Actions performed

Review triggered.

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.

@williaby

Copy link
Copy Markdown
Collaborator Author

PR Review

Status: CI green (23/23), SonarCloud quality gate PASSED (0 new issues, 0 hotspots). Copilot submitted 3 inline comments; CodeRabbit acknowledged the prior fix cycle.

Agent findings: 0 Critical / 2 Important / 3 Suggested / 1 Informational.


Important (should fix)

  • [Copilot + Security] workflow-templates/python-security-analysis.yml#L95-L98: dependency-security job is gated if: github.event_name == 'pull_request', so it is silently skipped on merge_group runs. The security-gate aggregator's is_acceptable() treats skipped as success, so a queued PR passes the security gate without dependency review running. Contradicts the new RAD comment ("vulnerabilities introduced by the speculative merge are caught"). The underlying actions/dependency-review-action does not natively support merge_group, so the fix is either (a) acknowledge the gap explicitly in the CRITICAL comment, or (b) add a merge_group-compatible substitute (e.g., osv-scanner on the queue ref).

  • [PRDesc] PR body `## Summary` still lists only three templates, but the diff modifies nine. The CHANGELOG entry is accurate; only the PR body Summary is stale from the original 3-template scope. Update so the squash-merge commit message matches CHANGELOG.

Suggested (consider addressing)

  • [Copilot] workflow-templates/python-security-analysis.yml#L42-L58: `detect-changes` job lacks both `timeout-minutes` and `step-security/harden-runner`. Pre-existing inconsistency, newly relevant on the merge_group ref.
  • [Copilot] workflow-templates/python-sonarcloud.yml#L36: `sonarcloud` job has no `step-security/harden-runner` step at all. Add it as the first step to match every other security/CI template.
  • [CLAUDE.md / RAD] Eight of nine templates use `# CRITICAL:` but omit the paired `#VERIFY` instruction that CLAUDE.md requires. Only `python-ci.yml` includes one. Replicate, reference, or consolidate.

Informational

  • [Coverage] PR body claims `python-pr-validation.yml` is excluded due to deprecation. Verify the deprecation header still says "WILL BE REMOVED IN A FUTURE RELEASE" before merge.

Recommended actions: address Important #1 (dependency-security skip) and #2 (PR body Summary). Suggested items can defer to a follow-up. After items 1-2, PR is mergeable.

🤖 Generated with Claude Code

williaby and others added 2 commits May 25, 2026 16:52
Three issues raised by Copilot's PR review:

1. python-security-analysis.yml: detect-changes job lacked timeout-minutes
   and step-security/harden-runner. Every other job in the file starts with
   harden-runner; merge_group trigger newly exposes the inconsistency on the
   queue ref. Added timeout-minutes: 5 and harden-runner as first step.

2. python-security-analysis.yml: dependency-security job is gated to
   github.event_name == 'pull_request' and is silently skipped on merge_group
   runs. The new RAD comment in the on: block claimed full coverage of the
   speculative-merge security gate. Documented the actions/dependency-review-
   action limitation explicitly (it requires PR base/head SHAs that don't
   exist on merge_group refs), confirmed the remaining 4 of 5 sub-scans
   still run on the queue ref, and flagged osv-scanner-on-merge_group as
   a follow-up coverage gap.

3. python-sonarcloud.yml: sonarcloud job lacked step-security/harden-runner.
   Added as first step to match the baseline used by every other security
   and CI template.

Refs #154, #163

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Six templates carried a #CRITICAL tag on their new merge_group: trigger but
omitted the paired #VERIFY instruction that CLAUDE.md RAD rules require. The
verification procedure is documented once in python-ci.yml's CRITICAL block
(enable merge_queue on a sacrificial repo, confirm check appears on the
merge_group ref). Added a single-line pointer to that procedure rather than
duplicating it in every file. The seventh template (python-security-analysis.yml)
already received an inline #VERIFY in the prior commit.

Templates updated:
- python-cifuzzy.yml
- python-compatibility.yml
- python-container-security.yml
- python-docs.yml
- python-fips-compatibility.yml
- python-reuse.yml

Refs #154, #163

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@sonarqubecloud

Copy link
Copy Markdown

@williaby

Copy link
Copy Markdown
Collaborator Author

PR Fix Summary

Addressed pr-review and Copilot findings; pushed 2 commits.

Important (resolved)

  • dependency-security skipped on merge_group: documented as a known limitation in ca11cd5. actions/dependency-review-action requires PR base/head SHAs and does not support merge_group events. The remaining 4 of 5 sub-scans (CodeQL, Bandit, OSV-Scanner, OWASP DC) execute on merge_group refs. Follow-up: track osv-scanner-on-merge_group as a coverage gap under Enable GitHub merge_queue for repos with auto-merging dep bumps #154.
  • PR body Summary stale: updated to list all 9 templates so the squash-merge commit message matches CHANGELOG.

Suggested (resolved)

  • detect-changes job hardening: added timeout-minutes: 5 and step-security/harden-runner as first step in python-security-analysis.yml. Fixed in ca11cd5.
  • sonarcloud job hardening: added step-security/harden-runner as first step in python-sonarcloud.yml. Fixed in ca11cd5.
  • #VERIFY annotations: added one-line pointer to python-ci.yml's verification procedure in the 6 remaining templates. Fixed in 234e5ca.

Informational (verified accurate)

  • python-pr-validation.yml exclusion: confirmed the reusable workflow's header carries the WILL BE REMOVED IN A FUTURE RELEASE deprecation notice. PR body claim is accurate.

Verification

  • Pre-commit: all hooks pass (yamllint, detect-secrets, TruffleHog, no-em-dash, commitizen).
  • actionlint: no new errors introduced; pre-existing SC2086 info-level warnings on existing run blocks (lines 61, 111 of python-sonarcloud.yml) are unrelated to these changes.

CI re-run triggered by push.

🤖 Generated with Claude Code

@williaby
williaby merged commit 51a0025 into main May 25, 2026
24 checks passed
@williaby
williaby deleted the claude/issue-154-merge-group-trigger-0 branch May 25, 2026 23:59
williaby added a commit to ByronWilliamsCPA/.claude that referenced this pull request May 26, 2026
…tant

Add CI-062 (severity: important) requiring repos with auto-merge enabled
to declare a merge_queue rule on the main branch ruleset. Promote CI-040
(merge_group trigger on primary CI workflow) from suggested to important.

Both checks are required for GitHub merge queue to function:
- CI-040 ensures gates emit on merge_group so the queue can verify them
- CI-062 ensures the ruleset actually enables the queue

Cost model from the incident captured in the referenced issue: N sequential
auto-merges trigger N(N+1)/2 CI runs from cascading rebases, since each
merge forces every other queued PR into BEHIND state. The 2026-05-24
homelab-infra incident consumed roughly 30 min of paid Actions minutes to
land 5 trivial Renovate PRs. Queue-batched, the same workload requires
1 to 2 CI runs.

Companion docs: add "Merge queue and auto-merge" section to
.claude/rules/git-workflow.md covering when to enable, the two
prerequisites, interaction with auto-merge, and references.

Companion rollout PRs:
- ByronWilliamsCPA/.github#163 (org workflow templates) [merged]
- homelab-infra consumer workflows [in flight]

Refs ByronWilliamsCPA/.github#154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
williaby added a commit to ByronWilliamsCPA/.claude that referenced this pull request May 26, 2026
…tant

Add CI-062 (severity: important) requiring repos with auto-merge enabled
to declare a merge_queue rule on the main branch ruleset. Promote CI-040
(merge_group trigger on primary CI workflow) from suggested to important.

Both checks are required for GitHub merge queue to function:
- CI-040 ensures gates emit on merge_group so the queue can verify them
- CI-062 ensures the ruleset actually enables the queue

Cost model from the incident captured in the referenced issue: N sequential
auto-merges trigger N(N+1)/2 CI runs from cascading rebases, since each
merge forces every other queued PR into BEHIND state. The 2026-05-24
homelab-infra incident consumed roughly 30 min of paid Actions minutes to
land 5 trivial Renovate PRs. Queue-batched, the same workload requires
1 to 2 CI runs.

Companion docs: add "Merge queue and auto-merge" section to
.claude/rules/git-workflow.md covering when to enable, the two
prerequisites, interaction with auto-merge, and references.

Companion rollout PRs:
- ByronWilliamsCPA/.github#163 (org workflow templates) [merged]
- homelab-infra consumer workflows [in flight]

Refs ByronWilliamsCPA/.github#154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
williaby added a commit to ByronWilliamsCPA/.claude that referenced this pull request May 26, 2026
…tant (#150)

* feat(manifest): add CI-062 merge_queue check, promote CI-040 to important

Add CI-062 (severity: important) requiring repos with auto-merge enabled
to declare a merge_queue rule on the main branch ruleset. Promote CI-040
(merge_group trigger on primary CI workflow) from suggested to important.

Both checks are required for GitHub merge queue to function:
- CI-040 ensures gates emit on merge_group so the queue can verify them
- CI-062 ensures the ruleset actually enables the queue

Cost model from the incident captured in the referenced issue: N sequential
auto-merges trigger N(N+1)/2 CI runs from cascading rebases, since each
merge forces every other queued PR into BEHIND state. The 2026-05-24
homelab-infra incident consumed roughly 30 min of paid Actions minutes to
land 5 trivial Renovate PRs. Queue-batched, the same workload requires
1 to 2 CI runs.

Companion docs: add "Merge queue and auto-merge" section to
.claude/rules/git-workflow.md covering when to enable, the two
prerequisites, interaction with auto-merge, and references.

Companion rollout PRs:
- ByronWilliamsCPA/.github#163 (org workflow templates) [merged]
- homelab-infra consumer workflows [in flight]

Refs ByronWilliamsCPA/.github#154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(manifest): correct CI-062 verify block per review

Address Copilot review findings on PR #150:

- Renovate auto-merge signal must check renovate.json at the repo root
  (BWCPA org standard per CI-020), not .github/renovate.json. The original
  path was a non-standard fallback that does not exist on any audited
  BWCPA repo; as written, CI-062 would have fallen through to "no signal"
  and reported N/A for every repo.
- The Rulesets API jq filter now pins the ruleset to the main branch
  (refs/heads/main or ~DEFAULT_BRANCH); the prior filter accepted any
  branch-targeted ruleset and could false-PASS on repos that declared
  merge_queue on a non-main ruleset.
- The "no signal present" branch now reads "skip (N/A per
  not_applicable_when)" so it does not conflict with the existing
  not_applicable_when field. The two paths previously expressed the
  same exemption with different semantics.

Also bump manifest last_updated to 2026-05-26 and align the inline
header changelog entry to the same date so downstream compliance
reports treat this revision as freshly modified.

Refs ByronWilliamsCPA/.github#154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* docs(changelog,rules): record CI-062 entry and cite merge-queue threshold source

Add the missing CHANGELOG.md Unreleased entry for the CI-062 addition
and CI-040 severity promotion. Per CLAUDE.md OpenSSF baseline, feat
commits must update CHANGELOG before release.

In .claude/rules/git-workflow.md, source-cite the "roughly 5
dependency-bump PRs per week" enablement threshold to the homelab-infra
incident captured in ByronWilliamsCPA/.github#154 so future readers
treat the number as an incident-derived heuristic rather than a
documented org policy.

Refs ByronWilliamsCPA/.github#154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
williaby added a commit to ByronWilliamsCPA/.claude that referenced this pull request May 30, 2026
…tant (#150)

* feat(manifest): add CI-062 merge_queue check, promote CI-040 to important

Add CI-062 (severity: important) requiring repos with auto-merge enabled
to declare a merge_queue rule on the main branch ruleset. Promote CI-040
(merge_group trigger on primary CI workflow) from suggested to important.

Both checks are required for GitHub merge queue to function:
- CI-040 ensures gates emit on merge_group so the queue can verify them
- CI-062 ensures the ruleset actually enables the queue

Cost model from the incident captured in the referenced issue: N sequential
auto-merges trigger N(N+1)/2 CI runs from cascading rebases, since each
merge forces every other queued PR into BEHIND state. The 2026-05-24
homelab-infra incident consumed roughly 30 min of paid Actions minutes to
land 5 trivial Renovate PRs. Queue-batched, the same workload requires
1 to 2 CI runs.

Companion docs: add "Merge queue and auto-merge" section to
.claude/rules/git-workflow.md covering when to enable, the two
prerequisites, interaction with auto-merge, and references.

Companion rollout PRs:
- ByronWilliamsCPA/.github#163 (org workflow templates) [merged]
- homelab-infra consumer workflows [in flight]

Refs ByronWilliamsCPA/.github#154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(manifest): correct CI-062 verify block per review

Address Copilot review findings on PR #150:

- Renovate auto-merge signal must check renovate.json at the repo root
  (BWCPA org standard per CI-020), not .github/renovate.json. The original
  path was a non-standard fallback that does not exist on any audited
  BWCPA repo; as written, CI-062 would have fallen through to "no signal"
  and reported N/A for every repo.
- The Rulesets API jq filter now pins the ruleset to the main branch
  (refs/heads/main or ~DEFAULT_BRANCH); the prior filter accepted any
  branch-targeted ruleset and could false-PASS on repos that declared
  merge_queue on a non-main ruleset.
- The "no signal present" branch now reads "skip (N/A per
  not_applicable_when)" so it does not conflict with the existing
  not_applicable_when field. The two paths previously expressed the
  same exemption with different semantics.

Also bump manifest last_updated to 2026-05-26 and align the inline
header changelog entry to the same date so downstream compliance
reports treat this revision as freshly modified.

Refs ByronWilliamsCPA/.github#154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* docs(changelog,rules): record CI-062 entry and cite merge-queue threshold source

Add the missing CHANGELOG.md Unreleased entry for the CI-062 addition
and CI-040 severity promotion. Per CLAUDE.md OpenSSF baseline, feat
commits must update CHANGELOG before release.

In .claude/rules/git-workflow.md, source-cite the "roughly 5
dependency-bump PRs per week" enablement threshold to the homelab-infra
incident captured in ByronWilliamsCPA/.github#154 so future readers
treat the number as an incident-derived heuristic rather than a
documented org policy.

Refs ByronWilliamsCPA/.github#154

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants