diff --git a/.github/mergify.yml b/.github/mergify.yml index 051cf45..d3e5e23 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,27 +1,21 @@ queue_rules: - name: default - conditions: - - 'status-success~=Build & Test - Nixpkgs.*' - -pull_request_rules: - - name: automatic merge - conditions: + queue_conditions: - 'status-success~=Build & Test - Nixpkgs.*' - "#approved-reviews-by>=1" - "label=merge-queue" - "base=main" - actions: - queue: - name: default - method: merge + merge_conditions: + - 'status-success~=Build & Test - Nixpkgs.*' + merge_method: merge +pull_request_rules: - name: delete head branch after merge conditions: - merged - closed actions: delete_head_branch: {} - - name: remove from merge-queue after merge conditions: - merged @@ -29,3 +23,7 @@ pull_request_rules: label: remove: - "merge-queue" + - name: automatic merge + conditions: [] + actions: + queue: