You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maka.apache.org by as...@apache.org on 2026/08/20 06:03:58 UTC
(maka) branch docs/contributing-fast-path-approval created (now 38dea5b71)
This is an automated email from the ASF dual-hosted git repository.
Astro-Han pushed a change to branch docs/contributing-fast-path-approval
in repository https://gitbox.apache.org/repos/asf/maka.git
at 38dea5b71 docs: align the fast path with enforced branch protection
This branch includes the following new commits:
new 38dea5b71 docs: align the fast path with enforced branch protection
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org
(maka) 01/01: docs: align the fast path with enforced branch protection
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
Astro-Han pushed a commit to branch docs/contributing-fast-path-approval
in repository https://gitbox.apache.org/repos/asf/maka.git
commit 38dea5b71b0810b3308614f2c4c5f217cc5f3e66
Author: AstroHan <le...@outlook.com>
AuthorDate: Thu Aug 20 14:03:30 2026 +0800
docs: align the fast path with enforced branch protection
Branch protection landed in .asf.yaml (#3262) and now requires one approving review and a passing `test` check on every pull request to main, with stale approvals dismissed on each new commit. That makes merging "without independent human review" impossible: an approval can only come from someone other than the author, which is by definition independent human review. The public governance document described a route that GitHub no longer allows.
Redefine the fast path rather than delete it. The section now states the baseline every pull request clears, says which changes need more than that baseline, and scopes the fast path to changes where the baseline alone is enough — no maintainer sign-off and no mailing list thread on top. The question the section exists to answer, which changes can take the light route, keeps an answer.
Switch the public-decision rule from future to present tense. dev@maka.apache.org exists and carries active threads, so project-level decisions belong there now rather than "once an ASF development list is available".
Both language versions are edited to say the same thing; the Chinese text is written for Chinese readers rather than translated clause by clause. Section headings are unchanged, so neither table of contents needs an update.
Checked .github/skills/code-review/SKILL.md and .coderabbit.yaml, which both tell automated reviewers not to make a fast-path determination. That determination still exists under the new definition, so neither file needs a change.
Generated-by: Claude Code
---
CONTRIBUTING.md | 10 ++++++----
CONTRIBUTING.zh-CN.md | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 94ab82349..e95aeea60 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ the private flow in [SECURITY.md](./SECURITY.md), never as a public issue.
## Public decisions
-Discuss project direction, governance, and material product decisions publicly before implementation, and record the reasoning. Once an ASF development list is available, project-level decisions should move there. Implementation-level technical decisions may be discussed in the pull request when the reasoning remains public and reviewable.
+Discuss project direction, governance, and material product decisions publicly before implementation, and record the reasoning. Project-level decisions belong on the development list, [`dev@maka.apache.org`](https://lists.apache.org/list.html?dev@maka.apache.org). Implementation-level technical decisions may be discussed in the pull request when the reasoning remains public and reviewable.
## Human ownership and AI attribution
@@ -60,11 +60,13 @@ Add the trailer to each pull request commit that contains material AI-authored c
## Review and fast path
-Material changes to user-visible behavior, public contracts, security, licensing, releases, or governance require independent review by another human. AI review does not count as independent human review. This requirement is separate from the human contributor of record, who is required for every contribution.
+Every pull request to `main` needs at least one approving review from a human other than the author, and the required `test` check must pass. Branch protection declared in [`.asf.yaml`](./.asf.yaml) enforces both, and a new commit dismisses the approvals already given. AI review does not count as independent human review. This is separate from the human contributor of record, who is required for every contribution.
-A contribution may use the fast path and be merged without independent human review only when it is low impact, easy to reverse, does not affect a protected area above, and passes the required checks.
+Material changes to user-visible behavior, public contracts, security, licensing, releases, or governance need more than that baseline: a reviewer familiar with the affected area, and, for project direction and governance, the public decision process above before implementation.
-When using the fast path, the person merging the pull request must comment on how the final revision meets these criteria. Any later commit requires a fresh determination and comment. A maintainer makes the final determination. Tests, CI, documentation, and mechanical changes may qualify, but their file type does not exempt them from review.
+The fast path is the baseline on its own. A contribution may use it when it is low impact, easy to reverse, does not affect a protected area above, and passes the required checks — one approving review and a green `test` are enough, with no maintainer sign-off or mailing list discussion on top.
+
+When using the fast path, the person merging the pull request must comment on how the final revision meets these criteria. Any later commit requires a fresh determination and comment. A maintainer has the final say on whether a change qualifies. Tests, CI, documentation, and mechanical changes may qualify, but their file type does not exempt them from review.
## Provenance and licensing
diff --git a/CONTRIBUTING.zh-CN.md b/CONTRIBUTING.zh-CN.md
index 880f4a421..c9f4b902d 100644
--- a/CONTRIBUTING.zh-CN.md
+++ b/CONTRIBUTING.zh-CN.md
@@ -38,7 +38,7 @@
## 公开决策
-项目方向、治理和重大产品决策应在实施前公开讨论并记录理由。ASF 开发邮件列表可用后,项目级决策应转移到那里。实现层面的技术决策可以在 PR 中讨论,前提是相关理由公开且可供审查。
+项目方向、治理和重大产品决策应在实施前公开讨论并记录理由。项目级决策在开发邮件列表 [`dev@maka.apache.org`](https://lists.apache.org/list.html?dev@maka.apache.org) 上进行。实现层面的技术决策可以在 PR 中讨论,前提是相关理由公开且可供审查。
## 人类责任与 AI 归因
@@ -58,11 +58,13 @@ Generated-by: <tool>
## 审查与 fast path
-对用户可见行为的重大变更、公开契约、安全、许可、发布或治理变更,必须由另一名人类进行独立审查。AI review 不算独立人工审查。这项要求不同于每项贡献都必须具备的 human contributor of record。
+向 `main` 提的每个 PR 都需要至少一位作者之外的人给出 approval,并且必需的 `test` 检查通过。[`.asf.yaml`](./.asf.yaml) 里声明的分支保护会强制这两点,新推的 commit 会让已有的 approval 失效。AI review 不算独立人工审查。这与每项贡献都必须具备的 human contributor of record 是两回事。
-只有在改动影响较低、容易回退、不影响上述受保护领域且必要检查通过时,贡献才能采用 fast path,在没有独立人工审查的情况下合并。
+对用户可见行为的重大变更,以及公开契约、安全、许可、发布或治理相关的改动,仅有这条底线还不够:需要由熟悉相关领域的人来审查;涉及项目方向和治理的,还要先走上文的公开决策流程。
-采用 fast path 时,合并者必须留言说明 PR 的最终版本如何满足这些条件;后续如有新 commit,必须重新判断并留言。最终由维护者决定。测试、CI、文档和机械修改可能符合条件,但文件类型本身不能豁免审查。
+fast path 就是只走这条底线。改动影响较低、容易回退、不涉及上述受保护领域且必要检查通过时,可以采用 fast path——一个 approval 加上 `test` 通过就足够,不再额外要求维护者签字或邮件列表讨论。
+
+采用 fast path 时,合并者必须留言说明 PR 的最终版本如何满足这些条件;后续如有新 commit,必须重新判断并留言。改动是否符合条件,最终由维护者认定。测试、CI、文档和机械修改可能符合条件,但文件类型本身不能豁免审查。
## 来源与许可
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org