File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -36,8 +36,6 @@ github:
3636 protected_branches :
3737 main :
3838 required_status_checks :
39- # strict means "Require branches to be up to date before merging".
40- strict : true
4139 contexts :
4240 # Repository policy and security checks.
4341 - Analyze Actions
@@ -58,6 +56,25 @@ github:
5856 required_approving_review_count : 1
5957
6058 required_linear_history : true
59+ rulesets :
60+ - name : Merge Queue
61+ target : branch
62+ enforcement : active
63+ conditions :
64+ ref_name :
65+ include :
66+ - " ~DEFAULT_BRANCH"
67+ exclude : []
68+ rules :
69+ - type : merge_queue
70+ parameters :
71+ check_response_timeout_minutes : 90
72+ grouping_strategy : ALLGREEN
73+ max_entries_to_build : 1
74+ max_entries_to_merge : 1
75+ merge_method : SQUASH
76+ min_entries_to_merge : 1
77+ min_entries_to_merge_wait_minutes : 0
6178 pull_requests :
6279 # allow pull requests to merge automatically once all requirements are met
6380 allow_auto_merge : true
Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ name: "ASF Allowlist Check"
2525
2626on :
2727 pull_request :
28+ merge_group :
2829 push :
2930 branches :
3031 - main
Original file line number Diff line number Diff line change 2727 branches :
2828 - ' main'
2929 pull_request :
30+ merge_group :
3031 workflow_dispatch :
3132
3233permissions :
Original file line number Diff line number Diff line change 2424 branches : [ "main" ]
2525 pull_request :
2626 branches : [ "main" ]
27+ merge_group :
2728 schedule :
2829 - cron : ' 16 4 * * 1'
2930
Original file line number Diff line number Diff line change 1818#
1919
2020name : " Run License Check"
21- on : pull_request
21+ on :
22+ pull_request :
23+ merge_group :
2224
2325permissions :
2426 contents : read
Original file line number Diff line number Diff line change 2424 branches :
2525 - ' main'
2626 pull_request :
27+ merge_group :
2728
2829permissions :
2930 contents : read
Original file line number Diff line number Diff line change 2424 branches :
2525 - ' main'
2626 pull_request :
27+ merge_group :
2728
2829permissions :
2930 contents : read
Original file line number Diff line number Diff line change 2424 branches :
2525 - ' main'
2626 pull_request :
27+ merge_group :
2728
2829permissions :
2930 contents : read
Original file line number Diff line number Diff line change 2424 branches : ["main"]
2525 pull_request :
2626 branches : ["**"]
27+ merge_group :
2728
2829permissions : {}
2930
You can’t perform that action at this time.
0 commit comments