summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorThomas Vigouroux <tomvig38@gmail.com>2021-07-18 18:42:24 +0200
committerThomas Vigouroux <tomvig38@gmail.com>2021-07-18 18:43:45 +0200
commit74d1d58572a0e017aacb3fb66b43add9d208b86e (patch)
treee5f539217674d171573dba6bbafa783890dc8246 /.github
parente88f154dc4eac529291a5287ceb4c56d1bdeba53 (diff)
ci(mergify): don't use queues
Diffstat (limited to '.github')
-rw-r--r--.github/mergify.yml12
1 files changed, 4 insertions, 8 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
index 4d3b7791..d0393cd7 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,16 +1,13 @@
-queue_rules:
- - name: default
- conditions:
- - "#check-failure=0"
-
pull_request_rules:
- name: Merge lockfile updates
conditions:
- "title=Update lockfile.json"
actions:
+ review:
+ type: APPROVE
+ message: Automatically approving lockfile updates
merge:
method: merge
-
- name: Merge on approval
conditions:
- and:
@@ -18,6 +15,5 @@ pull_request_rules:
- "#check-failure=0"
- "#approved-reviews-by>=1"
actions:
- queue:
+ merge:
method: rebase
- name: default