From: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue, 1 Sep 2020 09:44:54 +0000 (+0200)
Subject: ci: Do not create manual test-docs job in post-merge pipelines
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=615f1c8990db4499e65844d0f50dcdd43de65e37;p=mesa.git

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>
---

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