summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorJoshua Ashton <joshua@froggi.es>2022-11-24 01:39:34 +0000
committerJoshua Ashton <joshua@froggi.es>2022-12-21 11:03:20 +0000
commit7c5bb5e9c590f0ae4d45da757d66714ce06025f8 (patch)
treee04ce6f541e37af68c0f0f478783c909d13088ba /.gitlab-ci
parent07ed1a623a4b36cdb741a322008ba53d913dc765 (diff)
downloadxserver-7c5bb5e9c590f0ae4d45da757d66714ce06025f8.tar.gz
ci: Bump to wayland 1.21.0
wayland-protocols requires wayland-scanner 1.20, but Debian bullseye has 1.18 only Signed-off-by: Joshua Ashton <joshua@froggi.es> Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/debian-install.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 079b7056f..8c74c387c 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -129,6 +129,14 @@ make -j${FDO_CI_CONCURRENT:-4} install
popd
rm -rf xorgproto
+# wayland-protocols requires wayland-scanner 1.20, but Debian bullseye has 1.18 only
+git clone https://gitlab.freedesktop.org/wayland/wayland.git --depth 1 --branch=1.21.0
+cd wayland
+meson -Dtests=false -Ddocumentation=false -Ddtd_validation=false _build
+ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf wayland
+
# Xwayland requires wayland-protocols >= 1.22, but Debian bullseye has 1.20 only
git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.22
cd wayland-protocols