diff options
| author | Simon McVittie <smcv@collabora.com> | 2023-01-20 14:20:25 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2023-01-20 15:13:35 +0000 |
| commit | f1d05153b943b6c46192323ead096d5ca177f99e (patch) | |
| tree | 35fa497ba92828ba889a4a0deb97f208ee2df4c1 | |
| parent | 5a6df5a102227d1c34f1be6b3b2ac40782fe3d19 (diff) | |
| download | dbus-python-wip/smcv/build.tar.gz | |
ci-install.sh: Roll back to an older version of ninja on EOL Debian 10wip/smcv/build
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rwxr-xr-x | tools/ci-install.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh index ea3a24e..ca678ed 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -127,10 +127,12 @@ case "$ci_distro" in case "$ci_suite" in (buster|focal) + ninja=ninja==1.10.2.4 ;; (*) $sudo apt-get -qq -y install meson + ninja=ninja have_system_meson=true ;; esac @@ -162,9 +164,9 @@ esac if [ -n "$have_system_meson" ]; then : elif [ -n "${dbus_ci_system_python-}" ]; then - "$dbus_ci_system_python" -m pip install --user meson ninja + "$dbus_ci_system_python" -m pip install --user meson $ninja else - pip install meson ninja + pip install meson $ninja fi # vim:set sw=4 sts=4 et: |