Skip to content

Commit 7427b24

Browse files
authored
Align PR regulations in .asf.yaml (#366)
1 parent 1f5a2ff commit 7427b24

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

.asf.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
#
1717

1818
# `.asf.yaml` is a branch-specific YAML configuration file for Git repositories to control features such as notifications, GitHub settings, etc.
19-
# See its documentation for details: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
19+
# See its documentation for details: https://github.com/apache/infrastructure-asfyaml
2020

2121
# Bare minimum `notifications` to
2222
#
2323
# 1. Forward GitHub _activity_ to `notifications@`
2424
# 2. Forward commits to `commits@`
2525
# 3. Forward `dependabot` PRs to `robots@`
2626
#
27-
# Note that `notifications` are merged with the defaults accessible from: https://gitbox.apache.org/schemes.cgi?logging-log4j-samples
27+
# Note that `notifications` are merged with the defaults accessible from: https://gitbox.apache.org/schemes.cgi?logging-log4j2
2828
notifications:
2929
3030
@@ -42,9 +42,24 @@ github:
4242
- log4j2
4343
- logging
4444

45-
del_branch_on_merge: true
45+
# Pull Request settings:
46+
# https://github.com/apache/infrastructure-asfyaml#pull-request-settings
47+
pull_requests:
48+
# allow auto-merge
49+
allow_auto_merge: true
50+
# enable updating head branches of pull requests
51+
allow_update_branch: true
52+
# auto-delete head branches after being merged
53+
del_branch_on_merge: true
4654

47-
# Prevent force pushes to primary branches
55+
# Enforce squashing while merging PRs.
56+
# Otherwise, the git log gets polluted severely.
57+
enabled_merge_buttons:
58+
squash: true
59+
merge: false
60+
rebase: false
61+
62+
# Enforce Review-then-Commit
4863
protected_branches:
4964
main:
5065
# All commits must be signed

0 commit comments

Comments
 (0)