Mesa (master): gitlab-ci: Do not create the "success" job when the test-docs job exists

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jul 1 14:58:31 UTC 2020


Module: Mesa
Branch: master
Commit: 6cba468b5e79d8885a2a19eff58109b8722ef66b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cba468b5e79d8885a2a19eff58109b8722ef66b

Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Mon Jun 22 11:16:17 2020 +0200

gitlab-ci: Do not create the "success" job when the test-docs job exists

It's redundant in that case.

v2:
* Adapt to v2 of test-docs job rules.

Reviewed-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5469>

---

 .gitlab-ci.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a12b9dae013..e73b9001c9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,11 +97,15 @@ test-docs:
 success:
   stage: success
   image: debian:stable-slim
-  only:
-    - merge_requests
-  except:
-    changes:
-      *all_paths
+  rules:
+    - if: '$CI_PROJECT_NAMESPACE == "mesa"'
+      when: never
+    - if: '$GITLAB_USER_LOGIN == "marge-bot"'
+      changes: *docs-or-ci
+      when: never
+    - changes: *all_paths
+      when: never
+    - when: on_success
   variables:
     GIT_STRATEGY: none
   script:



More information about the mesa-commit mailing list