diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2020-09-01 11:44:54 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-09-02 16:29:29 +0000 |
| commit | 615f1c8990db4499e65844d0f50dcdd43de65e37 (patch) | |
| tree | 38b07dc4a5cbe5d98a3b370412beab21f627d31e /.gitlab-ci.yml | |
| parent | ed9ac3d60cffc60d97f5ddc168643ed7656224bf (diff) | |
ci: Do not create manual test-docs job in post-merge pipelines
Only in pre-merge pipelines for MRs, or in pipelines for forked project
branches.
Having the manual job in post-merge pipelines prevented the pages job
from running automatically as well, which could prevent the public
website from getting updated.
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6534>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1215315dfba..234f8e6524c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,8 @@ test-docs: - 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 + - if: '$CI_PROJECT_PATH != "mesa/mesa" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + changes: *docs-or-ci when: manual # Other cases default to never |