frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: update meson from 0.56.2 (bullseye) to 1.0.0 (bullseye-backports) 

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
This commit is contained in:
Alan Coopersmith 2024-09-09 07:47:32 -07:00
parent 32adf434b7
commit 3de2e27ccc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -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'

4
.gitlab-ci/debian-install.sh
View File

@ -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 \