diff --git a/.mergify.yml b/.mergify.yml index fa4589d72..b5c35a070 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,30 +1,17 @@ queue_rules: - name: default - conditions: - - -draft # not a draft - - base=main - -pull_request_rules: - - name: Automatic merge on approval and when when GitHub branch protection passes on main - conditions: + queue_conditions: - "#approved-reviews-by>=1" - -draft - base=main - actions: - queue: - method: merge - name: default - -pull_request_rules: - - name: Automatic merge for leadership team members when there are no reviewers and the label is "ready" - conditions: - - "#review-requested=0" - - "#changes-requested-reviews-by<1" - - -draft + merge_conditions: + - -draft # not a draft - base=main - - author=@leadership - - label=ready + merge_method: merge + +pull_request_rules: + - name: Automatic merge on approval and when when GitHub branch protection passes + on main + conditions: [] actions: queue: - method: merge - name: default