Skip to content

Commit

Permalink
mergify: Change docker-images check more explicit (#581)
Browse files Browse the repository at this point in the history
## Description

Add one explicit `check-success` condition for each of the docker-image actions.

## Why is this needed

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.

## How Has This Been Tested?

Verified to be valid using [mergify config editor](https://dashboard.mergify.com/github/tinkerbell/repo/tink/config-editor?repositoryName=tink&pullRequestNumber=563)
  • Loading branch information
mmlb authored Jan 19, 2022
2 parents 96cbe60 + 862c727 commit bb45990
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down

0 comments on commit bb45990

Please sign in to comment.