From 02546fa66a568ffb9acdc76445e27246fd469b74 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 7 Sep 2024 15:06:03 -0700 Subject: [PATCH] CI: update libdecor from 0.1.0 to 0.1.1 The install_demo meson_option was added in libdecor/libdecor@7106f5e32986e2773df8199a194b152a2a2c0cab which is in the 0.1.1 tag, but not 0.1.0. If we upgrade the version of meson used in the CI to 1.0.0, then it fails to build libdecor 0.1.0 with: ERROR: Unknown options: "install_demo" Signed-off-by: Alan Coopersmith (cherry picked from commit 32adf434b7138dc3f11358d164d55333706a4873) Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/debian-install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2e2a8942..0a2d0473e 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: "2024-04-11-no-xorg" + FDO_DISTRIBUTION_TAG: "2024-09-24-no-xorg" MESON_BUILDDIR: "build" include: diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index b3f06af35..41545ec8f 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -154,7 +154,7 @@ cd .. rm -rf wayland-protocols # Install libdecor for Xwayland -git clone https://gitlab.freedesktop.org/libdecor/libdecor.git --depth 1 --branch=0.1.0 +git clone https://gitlab.freedesktop.org/libdecor/libdecor.git --depth 1 --branch=0.1.1 cd libdecor meson _build -D{demo,install_demo}=false ninja -C _build -j${FDO_CI_CONCURRENT:-4} install