From 83694a1094c3377eaa12db4371dabafef37cdebe Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 22 Apr 2024 15:05:24 +0300 Subject: [PATCH] ci: Remove pip install version limits for meson/hotdoc We used to have them pinned to avoid unexpected issues when we wanted to update the image, however we haven't needed them lately and we should be good to install the latest stable version always. 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 9609fd1870..00c209633a 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-04-16.0' + FEDORA_TAG: '2024-04-22.4' - DEBIAN_TAG: '2024-04-22.0' + DEBIAN_TAG: '2024-04-22.4' INDENT_TAG: '2023-08-24.3' diff --git a/ci/docker/debian/install-deps.sh b/ci/docker/debian/install-deps.sh index de5c728a51..20a29c512f 100644 --- a/ci/docker/debian/install-deps.sh +++ b/ci/docker/debian/install-deps.sh @@ -5,6 +5,6 @@ set -eux apt update -y && apt full-upgrade -y apt install -y $(<./ci/docker/debian/deps.txt) -pip3 install --break-system-packages meson==1.2.3 hotdoc==0.16 python-gitlab tomli junitparser +pip3 install --break-system-packages meson 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 3037439ba3..2440de194b 100644 --- a/ci/docker/fedora/install-deps.sh +++ b/ci/docker/fedora/install-deps.sh @@ -32,7 +32,7 @@ dnf builddep -y gstreamer1 \ python3-gstreamer1 dnf remove -y meson -x ninja-build -pip3 install meson==1.2.3 hotdoc==0.16 python-gitlab tomli junitparser +pip3 install meson hotdoc python-gitlab tomli junitparser # Remove gst-devel packages installed by builddep above dnf remove -y "gstreamer1*devel"