Skip to content

Commit 2dcad90

Browse files
cederomxiaoxiang781216
authored andcommitted
github: master branch protection tune.
* Strict master branch protection requires all PR to be in sync with latest master even if changes are not related and there are no conflicts. * Because we have lots of daily merges this blocks most of the PRs as they are forced to be rebased on top of current master. * This also causes unnecessary automatic CI rebuild of each rebase. * Therefore we are setting strict status checks setting to false. * required_signatures in github means not only `git commit -s` but also cryptographic signature which is not required by us, setting false. * Disable "contexts" checks enforcement, that cause CI problems, mark TODO. References: https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits Signed-off-by: Tomasz 'CeDeROM' CEDRO <[email protected]>
1 parent fa0e073 commit 2dcad90

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.asf.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ github:
1919
protected_branches:
2020
master:
2121
required_status_checks:
22-
strict: true
23-
contexts:
24-
- Check
25-
- Lint
26-
- Build
22+
strict: false
23+
# Contexts cause hanging CI etc disable for now.
24+
# contexts:
25+
# - Check
26+
# - Lint
27+
# - Build
2728
required_pull_request_reviews:
2829
dismiss_stale_reviews: true
2930
require_last_push_approval: true
3031
required_approving_review_count: 2
3132
required_linear_history: true
32-
required_signatures: true
33+
required_signatures: false
3334
required_conversation_resolution: true

0 commit comments

Comments
 (0)