Skip to content

Commit e8a35ae

Browse files
authored
Disable commit signatures (#242)
1 parent 2f0d07c commit e8a35ae

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

.asf.yaml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,15 @@ github:
4141
- log4j2
4242
- logging
4343

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

4654
# Enforce squashing while merging PRs.
4755
# Otherwise, the git log gets polluted severely.
@@ -53,7 +61,20 @@ github:
5361
features:
5462
issues: true
5563

56-
# Prevent force pushes to primary branches
64+
# Enforce Review-then-Commit
5765
protected_branches:
5866
main:
59-
required_signatures: true
67+
# All reviews must be addressed before merging
68+
required_conversation_resolution: true
69+
# Require checks to pass before merging
70+
required_status_checks:
71+
checks:
72+
# The GitHub Actions app: 15368
73+
- app_id: 15368
74+
context: "build / build (ubuntu-latest)"
75+
# The GitHub Advanced Security app: 57789
76+
- app_id: 57789
77+
context: "CodeQL"
78+
# At least one positive review must be present
79+
required_pull_request_reviews:
80+
required_approving_review_count: 1

0 commit comments

Comments
 (0)