From 3de2e27ccc4ba0659ae171188c636a04afc6e1f0 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 9 Sep 2024 07:47:32 -0700 Subject: [PATCH] CI: update meson from 0.56.2 (bullseye) to 1.0.0 (bullseye-backports) Signed-off-by: Alan Coopersmith 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 517536b5b..a2e4a8a57 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-07-fix-anongit' + XORG_DEBIAN_TAG: '2024-09-09-meson-backport' 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 bd3738a12..81cb4cb62 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -15,7 +15,7 @@ EPHEMERAL=" xvfb " -# Add bullseye-backports for the newer linux-libc-dev package +# Add bullseye-backports for the newer linux-libc-dev & meson packages echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list apt update @@ -99,7 +99,7 @@ apt-get install -y \ libz-mingw-w64-dev \ linux-libc-dev/bullseye-backports \ mesa-common-dev \ - meson \ + meson/bullseye-backports \ mingw-w64-tools \ nettle-dev \ pkg-config \