diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2020-08-31 18:46:37 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-09-01 07:27:31 +0000 |
| commit | f13f32f83f379b777a7665ffd7d2a1e7aaaf3a62 (patch) | |
| tree | 00e862dcdd4e8f0dc9cdcf21500efd2fed86853a /.gitlab-ci.yml | |
| parent | 52cac068621a5998f486f8e44f9c2d9d045d1c31 (diff) | |
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 <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6522>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files 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 |