Skip to content

ci: sync auto-merge.yml — add codex/, drop jules/#181

Merged
github-actions[bot] merged 1 commit into
mainfrom
claude/sync-auto-merge-template
May 20, 2026
Merged

ci: sync auto-merge.yml — add codex/, drop jules/#181
github-actions[bot] merged 1 commit into
mainfrom
claude/sync-auto-merge-template

Conversation

@ANcpLua
Copy link
Copy Markdown
Owner

@ANcpLua ANcpLua commented May 20, 2026

Sync auto-merge.yml to canonical template — adds codex/ prefix, drops jules/ (deprecated), documents branch-prefix policy. Manual PR because the weekly sweep can't write directly to main on rulesetted repos.

Copilot AI review requested due to automatic review settings May 20, 2026 02:38
@github-actions
Copy link
Copy Markdown

@coderabbitai autofix

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 20, 2026

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 7da4d69a-e130-46b4-b29f-3787336472a0

📥 Commits

Reviewing files that changed from the base of the PR and between 9abb824 and 6454c60.

📒 Files selected for processing (1)
  • .github/workflows/auto-merge.yml

Cache: Disabled due to Reviews > Disable Cache setting

Knowledge base: Disabled due to data retention organization setting


Behavior Changes

The auto-merge workflow's job gating logic was modified to alter which branch prefixes trigger automatic merging:

  • Added: codex/ prefix now authorizes auto-merge (designated as primary AI-agent tier as of 2026-05-19)
  • Removed: jules/ prefix removed from authorization list (marked deprecated as of 2026-05-19)
  • Preserved: claude/ and copilot/ prefixes continue to route to auto-merge
  • Preserved: CodeRabbit approval branch (coderabbitai[bot] reviewer) retains auto-merge eligibility regardless of branch prefix

The conditional logic in enable-auto-merge job (lines 60-68) now enforces: (claude/ OR codex/ OR copilot/ OR coderabbit-approved) AND not draft.

Risk Surface

  • Breaking change for existing workflows: Any in-flight or future PRs opened with jules/ prefix will no longer auto-merge despite previously being eligible. This affects existing automation that may generate such branches.
  • Merge velocity impact: codex/ tier elevation as primary AI-agent tier changes merge hierarchy expectations; this aligns with broader tier separation documented in lines 7-23 (per-repo event-driven vs. central cron-based merge-on-green).
  • Repository state assumption: Sync assumes target repository has branch protection configured and native auto-merge enabled at Settings → General level (line 29).

Validation Evidence

The workflow invocation remains unchanged (gh pr merge ... --auto --squash, line 73); only job entry conditions modified. PR description confirms this as a sync from canonical template github-settings-automation/templates/auto-merge.yml as part of the 2026 pattern (lines 3-5).

Cross-Repo Implications

This PR is submitted manually to main (bypassing the weekly sweep) due to repository ruleset preventing direct writes by the automation account (noted in PR objectives). The synchronized changes codify branch-prefix policy across the fleet; any repository consuming the same template will receive identical codex/ inclusion and jules/ deprecation in their next scheduled sync cycle.

Walkthrough

The auto-merge workflow updates branch-prefix eligibility criteria: codex/ is added as the primary AI-agent tier and jules/ is removed as deprecated. The job condition now gates auto-merge to PRs with head branches starting with claude/, codex/, or copilot/. Documentation and the merge invocation are consistent with this new policy.

Changes

Auto-merge branch-prefix policy

Layer / File(s) Summary
Branch-prefix eligibility policy update
.github/workflows/auto-merge.yml
In-file comments document the updated branch-prefix eligibility policy; the enable-auto-merge job condition adds codex/ as a primary tier and removes jules/ from the gate; the native gh pr merge --auto --squash invocation remains unchanged.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~5 minutes

Possibly related PRs

Suggested labels

area:infra, area:build

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/sync-auto-merge-template
✨ Simplify code
  • Create PR with simplified code
  • Commit simplified code in branch claude/sync-auto-merge-template
  • 🛠️ architecture hardening
  • 🛠️ security pass
  • 🛠️ test gap closure
  • 🛠️ docs and changelog alignment
  • 🛠️ performance and allocation pass

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

@github-actions github-actions Bot merged commit 7bdd389 into main May 20, 2026
6 of 8 checks passed
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 20, 2026

Note

Autofix is a beta feature. Expect some limitations and changes as we gather feedback and continue to improve it.

Autofix skipped. No unresolved CodeRabbit review comments with fix instructions found.

@claude
Copy link
Copy Markdown

claude Bot commented May 20, 2026

Claude encountered an error after 2s —— View job


I'll analyze this and get back to you.

@codacy-production
Copy link
Copy Markdown

Up to standards ✅

🟢 Issues 0 issues

Results:
0 new issues

View in Codacy

AI Reviewer: first review requested successfully. AI can make mistakes. Always validate suggestions.

Run reviewer

TIP This summary will be updated as you push new changes.

Copy link
Copy Markdown

@codacy-production codacy-production Bot left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

The proposed changes to the auto-merge workflow correctly synchronize the branch-prefix policy by adding 'codex/' and removing 'jules/'. The PR is up to standards according to Codacy analysis, with no new quality issues or complexity increases. All acceptance criteria appear to be met, and the implementation follows the expected logic for CI synchronization.

Test suggestions

  • Verify branches starting with 'codex/' correctly evaluate to true in the workflow condition.
  • Verify branches starting with 'jules/' no longer evaluate to true in the workflow condition.
  • Verify that 'claude/' and 'copilot/' branches remain eligible for auto-merge.
  • Ensure draft PRs are still excluded from auto-merge regardless of branch prefix.
Prompt proposal for missing tests
Consider implementing these tests if applicable:
1. Verify branches starting with 'codex/' correctly evaluate to true in the workflow condition.
2. Verify branches starting with 'jules/' no longer evaluate to true in the workflow condition.
3. Verify that 'claude/' and 'copilot/' branches remain eligible for auto-merge.
4. Ensure draft PRs are still excluded from auto-merge regardless of branch prefix.

TIP Improve review quality by adding custom instructions
TIP How was this review? Give us feedback

@ANcpLua ANcpLua review requested due to automatic review settings May 20, 2026 03:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant