xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 445834826d4590d4d6f1f9f50c78df170835f02a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Mar 14 10:39:32 2023 -0700

    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 at oracle.com>

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'