From b3a5da5b5ca9824bd0e7264fe7b4fcc3e89f8bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 25 Oct 2024 19:24:38 +0100 Subject: [PATCH] ci: pin Meson on fedora/debian docker images to 1.5.2 for now Fixes g-ir-scanner breakage that seems to happen with latest Meson 1.6.0. /usr/bin/ld: build/tmp-introspectki7q5vp9/GstBase-1.0.o: undefined reference to symbol 'gst_init' /usr/bin/ld: build/subprojects/gstreamer/gst/libgstreamer-1.0.so.0: error adding symbols: DSO missing from command line Part-of: --- .gitlab-image-tags.yml | 4 ++-- ci/docker/debian/install-deps.sh | 2 +- ci/docker/fedora/install-deps.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index 043ff53f2c..f91a0ea5e2 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -5,9 +5,9 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2024-10-19.0-f40' + FEDORA_TAG: '2024-10-25.0' - DEBIAN_TAG: '2024-10-19.0-f40' + DEBIAN_TAG: '2024-10-25.0' INDENT_TAG: '2024-05-28.0' diff --git a/ci/docker/debian/install-deps.sh b/ci/docker/debian/install-deps.sh index 24c6571a53..8145449882 100644 --- a/ci/docker/debian/install-deps.sh +++ b/ci/docker/debian/install-deps.sh @@ -7,6 +7,6 @@ apt install -y $(<./ci/docker/debian/deps.txt) apt remove -y rustc cargo -pip3 install --break-system-packages meson hotdoc python-gitlab tomli junitparser +pip3 install --break-system-packages meson==1.5.2 hotdoc python-gitlab tomli junitparser apt clean all diff --git a/ci/docker/fedora/install-deps.sh b/ci/docker/fedora/install-deps.sh index 73eae7d511..2e9aee0a8c 100644 --- a/ci/docker/fedora/install-deps.sh +++ b/ci/docker/fedora/install-deps.sh @@ -38,7 +38,7 @@ dnf remove -y \ dnf install --setopt=install_weak_deps=false -y $(<./ci/docker/fedora/deps.txt) dnf remove -y meson -x ninja-build -pip3 install meson python-gitlab tomli junitparser +pip3 install meson==1.5.2 python-gitlab tomli junitparser pip3 install git+https://github.com/hotdoc/hotdoc.git@8c1cc997f5bc16e068710a8a8121f79ac25cbcce # Remove gst-devel packages installed by builddep above