From 00de20d26f2bd77b57bc50134af9a5bf7b1cbaff Mon Sep 17 00:00:00 2001 From: Justin Starry Date: Mon, 13 Sep 2021 10:24:28 -0500 Subject: [PATCH] Fix mergify automerge rule for explorer checks (#19831) --- .mergify.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index de32937ca..e3c6082b3 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -18,24 +18,32 @@ pull_request_rules: - "@solana-labs/community-pr-subscribers" - name: automatic merge (squash) on CI success conditions: - - status-success=buildkite/solana - - status-success=Travis CI - Pull Request - - status-success=check-explorer - - status-success=ci-gate - - label=automerge - - author≠@dont-squash-my-commits + - and: + - status-success=buildkite/solana + - status-success=Travis CI - Pull Request + - status-success=ci-gate + - label=automerge + - author≠@dont-squash-my-commits + - or: + # only require explorer checks if explorer files changed + - status-success=check-explorer + - -files~=^explorer/ actions: merge: method: squash # Join the dont-squash-my-commits group if you won't like your commits squashed - name: automatic merge (rebase) on CI success conditions: - - status-success=buildkite/solana - - status-success=Travis CI - Pull Request - - status-success=check-explorer - - status-success=ci-gate - - label=automerge - - author=@dont-squash-my-commits + - and: + - status-success=buildkite/solana + - status-success=Travis CI - Pull Request + - status-success=ci-gate + - label=automerge + - author=@dont-squash-my-commits + - or: + # only require explorer checks if explorer files changed + - status-success=check-explorer + - -files~=^explorer/ actions: merge: method: rebase