diff options
Diffstat (limited to '.mergify.yml')
| -rw-r--r-- | .mergify.yml | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/.mergify.yml b/.mergify.yml index 1bbffc0..c28b2ad 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -5,23 +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=pytest (macos-latest, 3.7)" - - "status-success=pytest (macos-latest, 3.8)" - - "status-success=pytest (macos-latest, 3.9)" - - "status-success=pytest (windows-latest, 3.7)" - - "status-success=pytest (windows-latest, 3.8)" - - "status-success=pytest (windows-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)" |