diff --git a/.mergify.yml b/.mergify.yml index ec0bb0ec..4ab5f03e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,33 +1,34 @@ queue_rules: - name: dependabot - conditions: + queue_conditions: + - "#approved-reviews-by>=1" + - author~=^dependabot(|-preview)\[bot\]$ - "status-success=continuous-integration/travis-ci/push" - "status-success=continuous-integration/travis-ci/pr" - + merge_conditions: + - "status-success=continuous-integration/travis-ci/push" + - "status-success=continuous-integration/travis-ci/pr" + merge_method: squash - name: ready-to-merge - conditions: + queue_conditions: + - "#approved-reviews-by>=1" + - "status-success=continuous-integration/travis-ci/pr" + - "status-success=continuous-integration/travis-ci/push" + - "label=ready-to-merge" + merge_conditions: - "status-success=Continuous Integration / Node CI (pull_request)" - "status-success=Continuous Integration / Wagtail CI (pull_request)" + merge_method: squash pull_request_rules: - - name: Automatic merge for dependabot PRs - conditions: - - "#approved-reviews-by>=1" - - author~=^dependabot(|-preview)\[bot\]$ - - "status-success=continuous-integration/travis-ci/push" - - "status-success=continuous-integration/travis-ci/pr" + - name: Automatic merge for PRs labelled "ready to merge" + Automatic merge for + dependabot PRs + conditions: [] actions: queue: - method: squash - name: dependabot - - - name: Automatic merge for PRs labelled "ready to merge" +priority_rules: + - name: priority for queue `dependabot` conditions: - - "#approved-reviews-by>=1" - - "status-success=continuous-integration/travis-ci/pr" - "status-success=continuous-integration/travis-ci/push" - - "label=ready-to-merge" - actions: - queue: - method: squash - name: ready-to-merge + - "status-success=continuous-integration/travis-ci/pr" + priority: 2250