Skip to content

feat(auto-merge): key on claude/ instead of codex/ #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ANcpLua merged 1 commit into from
Jun 30, 2026
Merged

feat(auto-merge): key on claude/ instead of codex/ #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions .github/workflows/auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,16 +25,14 @@
# natively without it).
#
# Branch-prefix policy:
# - codex/ — Codex agents
# - claude/ — Claude Code agents
# - copilot/ — GitHub Copilot agents when enabled

name: Auto-merge

on:
pull_request_target:
types: [opened, synchronize, reopened, ready_for_review]
pull_request_review:
types: [submitted]

permissions:
contents: write
Expand All @@ -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)
Expand Down
17 changes: 6 additions & 11 deletions templates/auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,16 +25,14 @@
# natively without it).
#
# Branch-prefix policy:
# - codex/ — Codex agents
# - claude/ — Claude Code agents
# - copilot/ — GitHub Copilot agents when enabled

name: Auto-merge

on:
pull_request_target:
types: [opened, synchronize, reopened, ready_for_review]
pull_request_review:
types: [submitted]

permissions:
contents: write
Expand All @@ -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)
Expand Down