From f253ae227600a5e5e4e541b498303a3b1ca1e3ae Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 6 Apr 2023 20:15:39 +1000 Subject: [PATCH] gitlab-ci: pass --break-system-packages to pip3 for the meson install pip on Debian 12 semi-forces us to use a venv. That's hard enough but even more so when we just want to run meson which only relies on the standard library anyway. Since that flag doesn't exist on earlier versions, try both and hope one invocation succeeds. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1595 (cherry picked from commit aa74fec602c034cf8b8f0238be40284539a2cd6c) --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/debian-install.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b941e7b46e..8a8797314c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,8 +54,8 @@ variables: # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". FEDORA_TAG: '2023-01-18.0-81a15acb09ec' - UBUNTU_TAG: '2023-01-18.0-1218be1cbc9d' - DEBIAN_TAG: '2023-01-18.0-1218be1cbc9d' + UBUNTU_TAG: '2023-01-18.0-b674114b79c1' + DEBIAN_TAG: '2023-01-18.0-b674114b79c1' CENTOS_TAG: '2023-01-18.0-81a15acb09ec' ALPINE_TAG: '2023-01-18.0-14c807942fa4' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 446b6c3eba..c4219768aa 100755 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -27,7 +27,8 @@ dbus-uuidgen --ensure sed -i 's/^# \(pl_PL.UTF-8 .*\)$/\1/p' /etc/locale.gen || true locale-gen pl_PL.UTF-8 -pip3 install meson +# Debian 12 and later requires --break-system-packages +pip3 install meson || pip3 install --break-system-packages meson # iproute2 5.2.0 on debian:sid causes our unit tests to fail. # Downgrade to a working version. See https://www.spinics.net/lists/netdev/msg584916.html