From d4c27e006b4bd916dd9fdb110abbf21881292992 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 14 Oct 2021 14:54:42 +0100 Subject: [PATCH] mergify: fix needs work labels We have clash with needs work and needs CI labels. If CI fails, we need to be in CI stage. Check for needs: CI label and apply work only if it was CI. Otherwise we would be in the loop. --- .mergify.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 7aae293bf3..0ba49f9437 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -47,33 +47,36 @@ pull_request_rules: - check-failure=cmake-checks - check-failure=frozen-tools-check - "label!=mergify skip" + - "label!='needs: work'" actions: label: add: ['needs: work'] remove: ['needs: review', 'needs: CI'] - # From needs: review to needs: work - CI failure + # From needs: CI to needs: work - CI failure in jenkins pipeline - name: "label needs: work when Jenkins CI failed - pr head" conditions: - # Jenkins CI failing + # Jenkins CI failing, only pr head - check-failure~=continuous-integration/jenkins/pr-head - "label!=mergify skip" + - "label=needs: CI" - -closed actions: label: add: ['needs: work'] - remove: ['needs: review','needs: CI'] + remove: ['needs: CI'] - # From needs: review to needs: work - CI failure + # From needs: CI to needs: work - CI failure - name: "label needs: work when Jenkins CI failed - any of the pipeline" conditions: # Jenkins CI failing - any of the pipeline - check-failure~=^jenkins-ci + - "label=needs: CI" - "label!=mergify skip" actions: label: add: ['needs: work'] - remove: ['needs: review', 'needs: CI'] + remove: ['needs: CI'] # From needs: review or needs: work to needs: CI. One approval means we should be good to start CI - name: "label needs: CI when at least one reviewers approval"