From 939caa36b6209fe79b646d89ceb688373334fbe4 Mon Sep 17 00:00:00 2001
From: Javier Neira <atreyu.bbb@gmail.com>
Date: Thu, 28 Oct 2021 19:17:05 +0200
Subject: [PATCH] Use new queue rules for mergify bot (#2301)
* Use new queue rules
* Add queue action
* Remove method from the queue rule
* Correct yaml
* Comment about empty conditions
---
.github/mergify.yml | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/.github/mergify.yml b/.github/mergify.yml
index e4759144..f4dcb236 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,9 +1,15 @@
+queue_rules:
+ - name: default
+ # Mergify always respects the branch protection settings
+ # so we can left empty mergify own ones
+ conditions: []
+
pull_request_rules:
- - actions:
- merge:
- strict: smart+fasttrack
- method: squash
- name: Automatically merge pull requests
+ - name: Automatically merge pull requests
conditions:
- label=merge me
- '#approved-reviews-by>=1'
+ actions:
+ queue:
+ method: squash
+ name: default
--
GitLab