diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-04-06 20:15:39 +1000 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-04-11 13:49:57 +0200 |
| commit | aa74fec602c034cf8b8f0238be40284539a2cd6c (patch) | |
| tree | fbda9d965f76c6e12b4b0e322117ce32ed221cc7 | |
| parent | 89a8f51235b7cc9c39c2aea8ff717da4e051f8e6 (diff) | |
| download | NetworkManager-aa74fec602c034cf8b8f0238be40284539a2cd6c.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/debian-install.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68d28c1942..71fe4e4cd0 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-82ad875db2dc' - 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-82ad875db2dc' 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 |