From 056ecbd35f0dcb1345dc3a27519337c905a324e3 Mon Sep 17 00:00:00 2001 From: Josh Holmer Date: Wed, 15 Dec 2021 19:46:36 -0500 Subject: [PATCH] Fix test name matching for mergify --- .mergify.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index e1949bc..d93248c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,13 +4,8 @@ pull_request_rules: - "#approved-reviews-by>=1" # Unfortunately, we cannot just say "all CI must pass". # This is not a bot limitation, but a limitation in Github itself. - - or: - - and: - - check-success=tests / all-tests - - check-success=tests / docker - - and: - - check-success=tests / all-tests (pull_request) - - check-success=tests / docker (pull_request) + - check-success=all-tests + - check-success=docker - check-success=SonarCloud Code Analysis - base=master actions: @@ -21,13 +16,8 @@ pull_request_rules: update_method: rebase - name: automatic merge for stable backports when CI passes conditions: - - or: - - and: - - check-success=tests / all-tests - - check-success=tests / docker - - and: - - check-success=tests / all-tests (pull_request) - - check-success=tests / docker (pull_request) + - check-success=all-tests + - check-success=docker - check-success=SonarCloud Code Analysis - base=stable - or: