summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2023-03-14 10:39:32 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2023-03-14 10:39:32 -0700
commit445834826d4590d4d6f1f9f50c78df170835f02a (patch)
tree3eec66fa8cde0faadfbe2a02f2bffa360bbcac74
parent1209a1bb57628df108600b09a77b15104e1bf1e2 (diff)
downloadxserver-445834826d4590d4d6f1f9f50c78df170835f02a.tar.gz
gitlab CI: add workflow rules
Needed due to the gitlab config changes described in: https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--.gitlab-ci.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1e725331..a61bf4def 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,3 +139,12 @@ check-merge-request:
reports:
junit: results.xml
allow_failure: true
+
+#
+# Workflow rules needed due to:
+# https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438
+#
+workflow:
+ rules:
+ - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_PIPELINE_SOURCE == 'push'