diff --git a/.mergify.yml b/.mergify.yml index f63c0df1..3ae8b741 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,16 +1,6 @@ queue_rules: - name: default - conditions: - # conditions for a PR to get merged (i.e., out of the queue) - - base=main - - status-success="check c bindings" - - status-success="check python bindings (ubuntu-latest, 3.8)" - - status-success="check-code-format" - -pull_request_rules: - - name: rebase and merge when passing all checks - conditions: - # conditions for a PR to get queued + queue_conditions: - base=main - status-success="check c bindings" - status-success="check python bindings (ubuntu-latest, 3.8)" @@ -21,11 +11,16 @@ pull_request_rules: - "#approved-reviews-by>0" - "#changes-requested-reviews-by=0" - -title~=^\[*[Ww][Ii][Pp] - actions: - queue: - name: default - method: merge - update_method: rebase + merge_conditions: + # conditions for a PR to get merged (i.e., out of the queue) + - base=main + - status-success="check c bindings" + - status-success="check python bindings (ubuntu-latest, 3.8)" + - status-success="check-code-format" + merge_method: merge + update_method: rebase + +pull_request_rules: - name: remove approved reviews when updated conditions: # conditions for approving reviews to be removed @@ -37,3 +32,7 @@ pull_request_rules: message: | All approving reviews have been removed because this pull request was updated. + - name: refactored queue action rule + conditions: [] + actions: + queue: