From f13f32f83f379b777a7665ffd7d2a1e7aaaf3a62 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Mon, 31 Aug 2020 18:46:37 +0200 Subject: [PATCH] ci: Create test-docs job in mesa/mesa pipelines for MRs Since the last GitLab update, pre-merge pipelines for MRs run in the mesa/mesa namespace, so this job didn't get created anymore, causing trouble. Reviewed-by: Daniel Stone Part-of: --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07fdd5ecc5d..13a9caecd6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,11 +70,12 @@ test-docs: stage: container+docs rules: - *ignore_scheduled_pipelines - - if: '$CI_PROJECT_NAMESPACE == "mesa"' - when: never - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' changes: *docs-or-ci when: on_success + - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"' + changes: *docs-or-ci + when: on_success - changes: *docs-or-ci when: manual # Other cases default to never -- 2.30.2