You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@magpie.apache.org by "potiuk (via GitHub)" <gi...@apache.org> on 2026/10/19 19:54:14 UTC

[PR] chore(asf): allow auto-merge on pull requests [magpie]

potiuk opened a new pull request, #1714:
URL: https://github.com/apache/magpie/pull/1714

   <!-- SPDX-License-Identifier: Apache-2.0
        https://www.apache.org/licenses/LICENSE-2.0 -->
   
   ## Summary
   
   - Flip `github.pull_requests.allow_auto_merge` in `.asf.yaml` from `false` to `true`.
   - Why: a maintainer can approve a PR and have it squash-merge once the required checks (`zizmor`, `prek`, `tests-ok`) pass, instead of returning to merge it by hand after CI. Today `gh pr merge --auto` fails with *"Auto merge is not allowed for this repository (enablePullRequestAutoMerge)"*.
   - Nothing about what gates `main` changes: the same required status checks, resolved review threads and linear history still apply. Auto-merge only waits for them.
   
   ## Type of change
   
   - [ ] Skill change (`.claude/skills/<name>/`) — eval fixtures updated below
   - [ ] Tool / bridge contract (`tools/<system>/*.md`)
   - [ ] Python package (`tools/*/` with `pyproject.toml`)
   - [ ] Groovy reference impl
   - [ ] Cross-cutting (RFC, AGENTS.md, sandbox, privacy-LLM)
   - [ ] Documentation (`docs/`, `README.md`, `CONTRIBUTING.md`)
   - [ ] Project template (`projects/_template/`)
   - [x] CI / dev loop (`prek`, workflows, validators)
   - [x] Other: repository settings (`.asf.yaml`)
   
   ## Test plan
   
   - [x] `prek run --files .asf.yaml` passes
   - [ ] After merge: ASF Infra reconciles `.asf.yaml` within a few minutes; confirm with `gh api repos/apache/magpie --jq .allow_auto_merge` (expect `true`) and a `gh pr merge <N> --squash --auto` on the next approved PR.
   
   ## RFC-AI-0004 compliance
   
   - [x] **HITL** — auto-merge is armed only by a maintainer, per PR; nothing merges without that explicit action and green required checks.
   
   ## Notes for reviewers (optional)
   
   One-line settings change with a comment explaining it. The other `pull_requests` settings (`allow_update_branch`, `del_branch_on_merge`) and `enabled_merge_buttons` (squash only) are untouched.
   
   ---
   
   Generative AI disclosure: this change was prepared with Claude Code (Claude Opus 5) and reviewed by the submitting maintainer.
   
   🤖 Generated with [Claude Code](https://claude.com/claude-code)
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@magpie.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] chore(asf): allow auto-merge on pull requests [magpie]

Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #1714:
URL: https://github.com/apache/magpie/pull/1714


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@magpie.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org