From e3480b0d78d05ab3b05541936314f1c34233c9b6 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Fri, 25 Nov 2022 21:18:27 +0100 Subject: [PATCH] Update the CI to provide wayland-protocols 1.30 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for tearing-updates-v1 Signed-off-by: Xaver Hugl Acked-by: Michel Dänzer Reviewed-by: Olivier Fourdan --- .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 a61bf4def..63431d146 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: FDO_UPSTREAM_REPO: xorg/xserver FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2023-01-25-libdrm-update" + FDO_DISTRIBUTION_TAG: "2023-03-04-new-wayland-protocols" include: - project: 'freedesktop/ci-templates' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 62c292be5..e1addb208 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -145,8 +145,8 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install cd .. rm -rf wayland -# Xwayland requires wayland-protocols >= 1.28, but Debian bullseye has 1.20 only -git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.28 +# Xwayland requires wayland-protocols >= 1.30, but Debian bullseye has 1.20 only +git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.30 cd wayland-protocols meson _build ninja -C _build -j${FDO_CI_CONCURRENT:-4} install