From 53e1bd141e717a19398364b41cc3c6c0e1d35309 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 11 Jun 2024 12:47:24 +0200 Subject: [PATCH] ci: fix meson install script a93932daf09191d3082c ("ci/meson: reuse meson installation") forgot to bump the image tags, and as a result this was merged untested and turned out to be broken, as the fedora image. The issue is that python in the Fedora image is not flagged as EXTERNALLY-MANAGED, unlike what Debian does, so the `--break-system-packages` is invalid. Instead, remove this flag from the debian image as it makes very little sense in a docker image. Fixes: a93932daf09191d3082c ("ci/meson: reuse meson installation") Part-of: --- .gitlab-ci/container/install-meson.sh | 9 ++++++++- .gitlab-ci/image-tags.yml | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/install-meson.sh b/.gitlab-ci/container/install-meson.sh index 7add453fc90..1c016ebcc50 100644 --- a/.gitlab-ci/container/install-meson.sh +++ b/.gitlab-ci/container/install-meson.sh @@ -1,4 +1,11 @@ #!/usr/bin/env bash +# When changing this file, you need to bump the following +# .gitlab-ci/image-tags.yml tags: +# DEBIAN_BUILD_TAG +# FEDORA_X86_64_BUILD_TAG + +rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED + # We need at least 1.4.0 for rusticl -pip3 install --break-system-packages 'meson==1.4.0' +pip3 install 'meson==1.4.0' diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 689f39c8f92..4fe146aa3b1 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,7 +16,7 @@ variables: DEBIAN_BASE_TAG: "20240529-rust" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "20240529-pkg-config" + DEBIAN_BUILD_TAG: "20240611-meson" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base" @@ -34,7 +34,7 @@ variables: ALPINE_X86_64_BUILD_TAG: "20240517-m0ld" ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto" - FEDORA_X86_64_BUILD_TAG: "20240509-meson" + FEDORA_X86_64_BUILD_TAG: "20240611-meson" KERNEL_TAG: "v6.6.21-mesa-f8ea" KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "3cc12a2a"