|
4 | 4 | # Synced from github-settings-automation/templates/auto-merge.yml by the |
5 | 5 | # weekly enforce-repo-settings sweep. Do not hand-edit per-repo. |
6 | 6 | # |
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. |
23 | 11 | # |
24 | 12 | # Renovate bot PRs do not need this workflow: Renovate enables native |
25 | 13 | # auto-merge itself via `platformAutomerge: true` in the shared preset |
|
38 | 26 | # |
39 | 27 | # Branch-prefix policy: |
40 | 28 | # - codex/ — Codex agents |
41 | | -# - copilot/ — GitHub Copilot agents (kept; dormant when quota exhausted) |
| 29 | +# - copilot/ — GitHub Copilot agents when enabled |
42 | 30 |
|
43 | 31 | name: Auto-merge |
44 | 32 |
|
|
0 commit comments