summaryrefslogtreecommitdiffstats
path: root/.mergify.yml
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@flameeyes.com>2021-11-07 12:23:56 +0100
committerDiego Elio Pettenò <flameeyes@flameeyes.com>2021-11-07 12:25:45 +0100
commit371f0df2f2c52442716d88760d97a2282c83ff95 (patch)
tree5008246ebf3952a60ce75c38ab9440ed679d89ed /.mergify.yml
parentpre-commit autoupdate. (diff)
downloadfreestyle-hid-371f0df2f2c52442716d88760d97a2282c83ff95.tar
freestyle-hid-371f0df2f2c52442716d88760d97a2282c83ff95.tar.gz
freestyle-hid-371f0df2f2c52442716d88760d97a2282c83ff95.tar.bz2
freestyle-hid-371f0df2f2c52442716d88760d97a2282c83ff95.tar.lz
freestyle-hid-371f0df2f2c52442716d88760d97a2282c83ff95.tar.xz
freestyle-hid-371f0df2f2c52442716d88760d97a2282c83ff95.tar.zst
freestyle-hid-371f0df2f2c52442716d88760d97a2282c83ff95.zip
Diffstat (limited to '.mergify.yml')
-rw-r--r--.mergify.yml20
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)"