diff --git a/.mergify.yml b/.mergify.yml index cbd84e1f1..4c3307dac 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,13 +1,13 @@ queue_rules: - name: default conditions: - - check-success=test (postgres, 3.7) + - check-success=test (postgres, 3.9) pull_request_rules: - name: automatic merge on CI success and review conditions: - - check-success=test (postgres, 3.7) + - check-success=test (postgres, 3.9) - "#approved-reviews-by>=1" - "#review-requested=0" - "#changes-requested-reviews-by=0" @@ -24,7 +24,7 @@ pull_request_rules: - name: automatic merge for pyUp pull requests conditions: - author=pyup-bot - - check-success=test (postgres, 3.7) + - check-success=test (postgres, 3.9) - label=dependencies - "#approved-reviews-by>=1" actions: @@ -34,7 +34,16 @@ pull_request_rules: - name: automatic merge for dependabot pull requests conditions: - author~=^dependabot(|-preview)\[bot\]$ - - check-success=test (postgres, 3.7) + - check-success=test (postgres, 3.9) + - label=dependencies + - "#approved-reviews-by>=1" + actions: + queue: + method: squash + name: default + - name: automatic merge for transifex pull requests + conditions: + - author~=^transifex-integration\[bot\]$ - label=dependencies - "#approved-reviews-by>=1" actions: