From fabd6a7c6504469f062d41d92b4701502ad82a3b Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Fri, 22 Oct 2021 00:26:43 +0200 Subject: [PATCH] Update the CI to provide wayland-protocols 1.22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for implementing drm-lease-v1 Signed-off-by: Xaver Hugl Acked-by: Michel Dänzer --- .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 ed4c7da7c..c7851fbf7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: FDO_UPSTREAM_REPO: xorg/xserver FDO_DISTRIBUTION_VERSION: buster-slim FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2021-07-09" + FDO_DISTRIBUTION_TAG: "2021-10-22" include: - project: 'freedesktop/ci-templates' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 16003e8a4..89ca49e14 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -131,8 +131,8 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install cd .. rm -rf wayland -# Xwayland requires wayland-protocols >= 1.18, but Debian buster has 1.17 only -git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.18 +# Xwayland requires wayland-protocols >= 1.22, but Debian buster has 1.17 only +git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.22 cd wayland-protocols ./autogen.sh make -j${FDO_CI_CONCURRENT:-4} install