Skip to content

Commit e9ee461

Browse files
committed
chore: sync auto-merge.yml to canonical
1 parent 8c603e9 commit e9ee461

1 file changed

Lines changed: 5 additions & 17 deletions

File tree

.github/workflows/auto-merge.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,10 @@
44
# Synced from github-settings-automation/templates/auto-merge.yml by the
55
# weekly enforce-repo-settings sweep. Do not hand-edit per-repo.
66
#
7-
# Tier separation (this file vs. github-settings-automation/pr-heal.yml):
8-
#
9-
# - THIS FILE (per-repo, event-driven):
10-
# Fires immediately on PR open/sync/review-submit. Handles BOT and
11-
# AI-AGENT PRs that should auto-merge with no human latency, plus
12-
# Codex-approved manual PRs.
13-
#
14-
# - pr-heal.yml Job 0 (central cron, 15-min sweep):
15-
# Handles OWNER-authored PRs (incl. agents acting via gh CLI auth as
16-
# ANcpLua) with a 5-min cooldown so reviewer tiers can land advisory
17-
# comments before merge-on-green fires. See PR#170 incident (2026-05-18)
18-
# for the precedent: owner PR merged before advisory review completed.
19-
#
20-
# The owner-clause that USED to live in this file's `if:` was removed in
21-
# the same change. Routing owner PRs through the cron tier gives them the
22-
# cooldown they need without blocking the bot tier.
7+
# This file is per-repo and event-driven. It enables native GitHub auto-merge
8+
# only for trusted automation branches (codex/, copilot/) and Codex-approved
9+
# manual PRs. There is no central PR-heal cron in the merge path, and no
10+
# review-bot (CodeRabbit etc.) approval ever triggers a merge.
2311
#
2412
# Renovate bot PRs do not need this workflow: Renovate enables native
2513
# auto-merge itself via `platformAutomerge: true` in the shared preset
@@ -38,7 +26,7 @@
3826
#
3927
# Branch-prefix policy:
4028
# - codex/ — Codex agents
41-
# - copilot/ — GitHub Copilot agents (kept; dormant when quota exhausted)
29+
# - copilot/ — GitHub Copilot agents when enabled
4230

4331
name: Auto-merge
4432

0 commit comments

Comments
 (0)