From 252b94a009a4ce71747ca6e7fd0cb08973dcfe3a Mon Sep 17 00:00:00 2001 From: ancplua Date: Tue, 30 Jun 2026 17:32:01 +0200 Subject: [PATCH] feat(auto-merge): key on claude/ instead of codex/ The owner is standardizing on Claude Code for agent-driven work and no longer uses the OpenAI Codex connector. Retarget the fleet auto-merge template (and the control-plane's own copy) accordingly: - branch-prefix allowlist: codex/ -> claude/ (copilot/ kept) - drop the chatgpt-codex-connector[bot] approval clause - drop the now-dead pull_request_review trigger (its only consumer was the codex bot-approval clause) claude/ is already an established (if inconsistent) prefix across the fleet (e.g. this repo's #18/#20, qyl #432), authored by the owner via Claude Code. The companion qyl change encodes the convention in AGENTS.md so the trigger stays live. No reviewer automation added; change is scoped to the auto-merge surface only, per AGENTS.md hard rules. README "removed cron lanes" history and the AGENTS.md advisory-reviewer example list are left intact. Co-Authored-By: Claude Opus 4.8 (1M context) --- .github/workflows/auto-merge.yml | 17 ++++++----------- templates/auto-merge.yml | 17 ++++++----------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 75311bf..c531ebe 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -5,9 +5,9 @@ # weekly enforce-repo-settings sweep. Do not hand-edit per-repo. # # This file is per-repo and event-driven. It enables native GitHub auto-merge -# only for trusted automation branches (codex/, copilot/) and Codex-approved -# manual PRs. There is no central PR-heal cron in the merge path, and no -# review-bot (CodeRabbit etc.) approval ever triggers a merge. +# only for trusted automation branches (claude/, copilot/). There is no central +# PR-heal cron in the merge path, and no review-bot (CodeRabbit etc.) approval +# ever triggers a merge. # # Renovate bot PRs do not need this workflow: Renovate enables native # auto-merge itself via `platformAutomerge: true` in the shared preset @@ -25,7 +25,7 @@ # natively without it). # # Branch-prefix policy: -# - codex/ — Codex agents +# - claude/ — Claude Code agents # - copilot/ — GitHub Copilot agents when enabled name: Auto-merge @@ -33,8 +33,6 @@ name: Auto-merge on: pull_request_target: types: [opened, synchronize, reopened, ready_for_review] - pull_request_review: - types: [submitted] permissions: contents: write @@ -45,11 +43,8 @@ jobs: runs-on: ubuntu-latest if: | github.event.pull_request.draft == false && ( - startsWith(github.event.pull_request.head.ref, 'codex/') || - startsWith(github.event.pull_request.head.ref, 'copilot/') || - (github.event_name == 'pull_request_review' - && github.event.review.state == 'approved' - && github.event.review.user.login == 'chatgpt-codex-connector[bot]') + startsWith(github.event.pull_request.head.ref, 'claude/') || + startsWith(github.event.pull_request.head.ref, 'copilot/') ) steps: - name: Enable native auto-merge (squash) diff --git a/templates/auto-merge.yml b/templates/auto-merge.yml index 75311bf..c531ebe 100644 --- a/templates/auto-merge.yml +++ b/templates/auto-merge.yml @@ -5,9 +5,9 @@ # weekly enforce-repo-settings sweep. Do not hand-edit per-repo. # # This file is per-repo and event-driven. It enables native GitHub auto-merge -# only for trusted automation branches (codex/, copilot/) and Codex-approved -# manual PRs. There is no central PR-heal cron in the merge path, and no -# review-bot (CodeRabbit etc.) approval ever triggers a merge. +# only for trusted automation branches (claude/, copilot/). There is no central +# PR-heal cron in the merge path, and no review-bot (CodeRabbit etc.) approval +# ever triggers a merge. # # Renovate bot PRs do not need this workflow: Renovate enables native # auto-merge itself via `platformAutomerge: true` in the shared preset @@ -25,7 +25,7 @@ # natively without it). # # Branch-prefix policy: -# - codex/ — Codex agents +# - claude/ — Claude Code agents # - copilot/ — GitHub Copilot agents when enabled name: Auto-merge @@ -33,8 +33,6 @@ name: Auto-merge on: pull_request_target: types: [opened, synchronize, reopened, ready_for_review] - pull_request_review: - types: [submitted] permissions: contents: write @@ -45,11 +43,8 @@ jobs: runs-on: ubuntu-latest if: | github.event.pull_request.draft == false && ( - startsWith(github.event.pull_request.head.ref, 'codex/') || - startsWith(github.event.pull_request.head.ref, 'copilot/') || - (github.event_name == 'pull_request_review' - && github.event.review.state == 'approved' - && github.event.review.user.login == 'chatgpt-codex-connector[bot]') + startsWith(github.event.pull_request.head.ref, 'claude/') || + startsWith(github.event.pull_request.head.ref, 'copilot/') ) steps: - name: Enable native auto-merge (squash)