From aa7e56d03629e33ce8b4da7960324128145df909 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Mon, 14 Nov 2022 11:17:40 +0100 Subject: [PATCH] Update mergify queue conditions to account for update-nimbus-experiments PRs (#27774) The update-nimbus-experiments workflow creates PRs that don't schedule a `complete-pr` task (because the github-actions bot is untrusted), but in this case we have a `complete-push` task which is good enough. --- .mergify.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index de81dd583..0a4ba270b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,18 +3,7 @@ queue_rules: conditions: - or: - status-success=complete-pr - - and: - # For more context, see "Auto Merge" rules down below - - status-success=complete-push - - or: - - and: - - base~=^releases[_/].* - - or: - - head~=^automation/sync-strings-\d+ - - head~=^relbot/fenix-\d+ - - and: - - base=main - - head~=^relbot/AC-Nightly-.+ + - status-success=complete-push pull_request_rules: - name: Resolve conflict conditions: