From 862c727eee1d341436a9493d07a5c55fffac197f Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Wed, 19 Jan 2022 11:08:18 -0500 Subject: [PATCH] mergify: Change docker-images check more explicit The previous check was never matching because mergify was not being given the name of the matrix job, it is only given the realized name for each matrix instance. We also need to spell each matrix permuation we care about instead of `check-success~=docker-image` because mergify will happily merge once the first image build succeeds, it has not way to know it needs to wait for all of them. Signed-off-by: Manuel Mendez --- .github/mergify.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 672531406..d7d503f79 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -3,7 +3,9 @@ queue_rules: conditions: # Conditions to get out of the queue (= merged) - check-success=DCO - - check-success=docker-images + - check-success~=docker-images.*tink-cli + - check-success~=docker-images.*tink-server + - check-success~=docker-images.*tink-worker - check-success=validation pull_request_rules: @@ -14,7 +16,9 @@ pull_request_rules: - "#changes-requested-reviews-by=0" - "#review-requested=0" - check-success=DCO - - check-success=docker-images + - check-success~=docker-images.*tink-cli + - check-success~=docker-images.*tink-server + - check-success~=docker-images.*tink-worker - check-success=validation - label!=do-not-merge - label=ready-to-merge