From 80db062472a72735f5fa454a1f3977ea8702aad4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Nov 2021 15:23:22 +0100 Subject: [PATCH] ci(mergify): fix deprecated strict mode (#862) --- .mergify.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 3556a42..eaa2532 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -18,11 +18,11 @@ pull_request_rules: - name: warn on needs-work conditions: - or: - - check-failure=lint - - check-failure=test-linux - - check-failure=codecov/patch - - check-failure=codecov/project - - check-failure=snapshot + - check-failure=lint + - check-failure=test-linux + - check-failure=codecov/patch + - check-failure=codecov/project + - check-failure=snapshot actions: comment: message: '@{{author}} this pull request has failed checks 🛠' @@ -86,6 +86,14 @@ pull_request_rules: - check-success=codecov/project - check-success=snapshot actions: - merge: + queue: method: squash - strict: true + name: default +queue_rules: + - name: default + conditions: + - check-success=lint + - check-success=test-linux + - check-success=codecov/patch + - check-success=codecov/project + - check-success=snapshot