X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=3fea645d4140eaa5735e71362401773805f9da74;hb=1c9efcd7a6faa2e12361f5aa3007311563792095;hp=07fdd5ecc5dadb3da5dc5fe5d1ed7a1d55952b94;hpb=d3b652f13d89726757a0fd0d2d9c07084dd90a16;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07fdd5ecc5d..3fea645d414 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
@@ -118,14 +119,15 @@ success:
   image: debian:stable-slim
   rules:
     - *ignore_scheduled_pipelines
-    - if: '$CI_PROJECT_NAMESPACE == "mesa"'
+    - if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
       when: never
     - if: '$GITLAB_USER_LOGIN == "marge-bot"'
       changes: *docs-or-ci
       when: never
     - changes: *all_paths
       when: never
-    - when: on_success
+    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
+      when: on_success
   variables:
     GIT_STRATEGY: none
   script: