From bf2c7837574b1821f26eeffbc9542ee67818099b Mon Sep 17 00:00:00 2001 From: jneira Date: Sat, 23 Oct 2021 22:25:01 +0200 Subject: [PATCH 1/5] Use new queue rules --- .github/mergify.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index e4759144a9..e5a8df9b49 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,8 +1,8 @@ +queue_rules: + - name: default + method: squash + pull_request_rules: - - actions: - merge: - strict: smart+fasttrack - method: squash name: Automatically merge pull requests conditions: - label=merge me From 1a91e59ead01f4ef2b60cc5585d96657d7240485 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Mon, 25 Oct 2021 07:53:33 +0200 Subject: [PATCH 2/5] Add queue action --- .github/mergify.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index e5a8df9b49..8ddc95a880 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -7,3 +7,7 @@ pull_request_rules: conditions: - label=merge me - '#approved-reviews-by>=1' + actions: + queue: + method: squash + name: default From ac958995c548f0b86c3ca1c2b6684d8e42a8ebbd Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Mon, 25 Oct 2021 07:54:10 +0200 Subject: [PATCH 3/5] Remove method from the queue rule --- .github/mergify.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8ddc95a880..8c8d88aac0 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,6 +1,5 @@ queue_rules: - name: default - method: squash pull_request_rules: name: Automatically merge pull requests From f65ed4cf65176c7df2c8097e43223862e01cbe9a Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Mon, 25 Oct 2021 08:01:21 +0200 Subject: [PATCH 4/5] Correct yaml --- .github/mergify.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8c8d88aac0..8dca03571b 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,8 +1,9 @@ queue_rules: - name: default + conditions: [] pull_request_rules: - name: Automatically merge pull requests + - name: Automatically merge pull requests conditions: - label=merge me - '#approved-reviews-by>=1' From c222f1422f63dc08a13e55173bfa2a81961e0aae Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Thu, 28 Oct 2021 11:04:40 +0200 Subject: [PATCH 5/5] Comment about empty conditions --- .github/mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8dca03571b..f4dcb23635 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,5 +1,7 @@ queue_rules: - name: default + # Mergify always respects the branch protection settings + # so we can left empty mergify own ones conditions: [] pull_request_rules: