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.
pull/15141/head
Martin Kojtal 2021-10-14 14:54:42 +01:00
parent e4111eaa0d
commit d4c27e006b
1 changed files with 8 additions and 5 deletions

View File

@ -47,33 +47,36 @@ pull_request_rules:
- check-failure=cmake-checks - check-failure=cmake-checks
- check-failure=frozen-tools-check - check-failure=frozen-tools-check
- "label!=mergify skip" - "label!=mergify skip"
- "label!='needs: work'"
actions: actions:
label: label:
add: ['needs: work'] add: ['needs: work']
remove: ['needs: review', 'needs: CI'] 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" - name: "label needs: work when Jenkins CI failed - pr head"
conditions: conditions:
# Jenkins CI failing # Jenkins CI failing, only pr head
- check-failure~=continuous-integration/jenkins/pr-head - check-failure~=continuous-integration/jenkins/pr-head
- "label!=mergify skip" - "label!=mergify skip"
- "label=needs: CI"
- -closed - -closed
actions: actions:
label: label:
add: ['needs: work'] 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" - name: "label needs: work when Jenkins CI failed - any of the pipeline"
conditions: conditions:
# Jenkins CI failing - any of the pipeline # Jenkins CI failing - any of the pipeline
- check-failure~=^jenkins-ci - check-failure~=^jenkins-ci
- "label=needs: CI"
- "label!=mergify skip" - "label!=mergify skip"
actions: actions:
label: label:
add: ['needs: work'] 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 # 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" - name: "label needs: CI when at least one reviewers approval"