From ab59a07659d01879724915ee380ef773119bf6f8 Mon Sep 17 00:00:00 2001 From: Josh Holmer Date: Thu, 16 Dec 2021 09:06:52 -0500 Subject: [PATCH] Auto-merge if no tests were run because only config files modified --- .mergify.yml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 8755843..2e6cbfd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,11 +2,21 @@ pull_request_rules: - name: automatic merge for main when CI passes and approved conditions: - "#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. - - check-success=all-tests - - check-success=docker - - check-success=SonarCloud Code Analysis + - or: + # Unfortunately, we cannot just say "all CI must pass". + # This is not a bot limitation, but a limitation in Github itself. + - and: + - check-success=all-tests + - check-success=docker + - check-success=SonarCloud Code Analysis + # Auto-merge in the case where tests were not run + # because no source files were modified + - and: + - -files~=^av1an-cli/ + - -files~=^av1an-core/ + - -files~=^src/ + - -files~=^Cargo.* + - -files~=^Dockerfile - base=master actions: queue: @@ -16,9 +26,17 @@ pull_request_rules: update_method: rebase - name: automatic merge for stable backports when CI passes conditions: - - check-success=all-tests - - check-success=docker - - check-success=SonarCloud Code Analysis + - or: + - and: + - check-success=all-tests + - check-success=docker + - check-success=SonarCloud Code Analysis + - and: + - -files~=^av1an-cli/ + - -files~=^av1an-core/ + - -files~=^src/ + - -files~=^Cargo.* + - -files~=^Dockerfile - base=stable - or: - "#approved-reviews-by>=1"