Module: Mesa Branch: master Commit: 5a6a88f58ce23de1d0caddb26e456d89a08321a5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a6a88f58ce23de1d0caddb26e456d89a08321a5
Author: Michel Dänzer <[email protected]> Date: Mon Jan 20 18:39:50 2020 +0100 gitlab-ci: Use single if for manual job rules entry I thought multiple ifs would all need to match, but looks like only the last one (or either one?) does. This should prevent a manual pipeline from getting created after merging changes which can't affect the pipeline. Reviewed-by: Eric Engestrom <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3474> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3474> --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46cacb60e39..90bb3b33fef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,8 +45,7 @@ stages: *paths when: on_success # Allow triggering jobs manually on branches of forked projects - - if: '$CI_PROJECT_PATH != "mesa/mesa"' - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' + - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' when: manual # Otherwise, most jobs won't run - when: never _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
