xserver: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3cbc9eda073fa02cc20450c01f38fa30dc2b15b3
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Sep 10 13:28:39 2024 +0200

    ci: reduce nolibdecor build to xwayland only
    
    libdecor is only relevant for Xwayland, so no need to build all the
    other DDX'es for this build test. Remvoving some unncessary load from
    CI machines by disabling all DDX'es but Xwayland here.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1676>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2e4a8a57..cb2c1f61c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -180,11 +180,11 @@ meson-noglamor:
         MESON_EXTRA_ARGS: >
           -Dglamor=false
 
-meson-nolibdecor:
+xwayland-nolibdecor:
     extends: meson
     variables:
         MESON_EXTRA_ARGS: >
-          -Dlibdecor=false
+          -Dlibdecor=false -Dxorg=false -Dxephyr=false -Dxvfb=false -Dxnest=false
 
 mingw-cross-build:
     extends: .common-build-and-test