Skip to content

Commit afca660

Browse files
vyppkarwasz
andauthored
Disable commit signatures (#95)
Co-authored-by: Piotr P. Karwasz <piotr.github@karwasz.org>
1 parent 8223002 commit afca660

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

.asf.yaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,15 @@ github:
4646
- logger
4747
- scala
4848

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

5159
# Enforce squashing while merging PRs.
5260
# Otherwise, the git log gets polluted severely.
@@ -60,4 +68,17 @@ github:
6068

6169
protected_branches:
6270
main:
63-
required_signatures: true
71+
# All reviews must be addressed before merging
72+
required_conversation_resolution: true
73+
# Require checks to pass before merging
74+
required_status_checks:
75+
checks:
76+
# The GitHub Actions app: 15368
77+
- app_id: 15368
78+
context: "build / build (ubuntu-latest)"
79+
# The GitHub Advanced Security app: 57789
80+
- app_id: 57789
81+
context: "CodeQL"
82+
# At least one positive review must be present
83+
required_pull_request_reviews:
84+
required_approving_review_count: 1

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160

161161
<!-- dependency version -->
162162
<junit.version>4.13.2</junit.version>
163-
<log4j.version>2.24.3</log4j.version>
163+
<log4j.version>2.25.2</log4j.version>
164164
<mockito.version>4.11.0</mockito.version>
165165
<scalatest.version>3.2.10</scalatest.version>
166166
<scalatestplus.version>3.2.10.0</scalatestplus.version>

0 commit comments

Comments
 (0)