From a55ed3309bc57d8328283d2a65b89f1e58d92bf7 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Thu, 14 Nov 2024 17:33:21 +0100 Subject: [PATCH] ci: Install wayland-protocols 1.38 Signed-off-by: Olivier Fourdan Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/debian-install.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48fca7a9c..ab17016d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ variables: REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' XORG_DEBIAN_VERSION: 'bullseye-slim' XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - XORG_DEBIAN_TAG: '2024-09-09-meson-backport' + XORG_DEBIAN_TAG: '2024-11-14-wayland-protocols-1-38' XORG_FREEBSD_VERSION: '14.0' XORG_FREEBSD_EXEC: '' XORG_FREEBSD_TAG: '2024-06-10.0' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 81cb4cb62..f68ad3311 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -151,8 +151,8 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install cd .. rm -rf wayland -# Xwayland requires wayland-protocols >= 1.34, but Debian bullseye has 1.20 only -git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.34 +# Xwayland requires wayland-protocols >= 1.38, but Debian bullseye has 1.20 only +git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.38 cd wayland-protocols meson _build ninja -C _build -j${FDO_CI_CONCURRENT:-4} install