From baec12e3b7ad2d8e784d6460069954404de44632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 2 Nov 2021 19:51:43 +0000 Subject: Mergify: simplify the pull request rules. --- .mergify.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index e7c5b35..9bc4b9b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -5,17 +5,9 @@ pull_request_rules: - name: Automatic merge on approval conditions: - - "#approved-reviews-by>=1" - - "status-success=pytest (ubuntu-latest, 3.7)" - - "status-success=pytest (ubuntu-latest, 3.8)" - - "status-success=pytest (ubuntu-latest, 3.9)" - - "status-success=pre-commit" - actions: - merge: - method: rebase - - name: Automatic merge from Flameeyes - conditions: - - "author=Flameeyes" + - or: + - "#approved-reviews-by>=1" + - "author=Flameeyes" - "status-success=pytest (ubuntu-latest, 3.7)" - "status-success=pytest (ubuntu-latest, 3.8)" - "status-success=pytest (ubuntu-latest, 3.9)" -- cgit v1.2.3