Merge branch 'ps/ci-avoid-broken-sudo-on-ubuntu' into maint-2.51

Git fork

Our CI script requires "sudo" that can be told to preserve
environment, but Ubuntu replaced with "sudo" with an implementation
that lacks the feature. Work this around by reinstalling the
original version.

* ps/ci-avoid-broken-sudo-on-ubuntu:
ci: fix broken jobs on Ubuntu 25.10 caused by switch to sudo-rs(1)

Junio C Hamano 5 months ago 73f63c39 2ba32bef

1 changed file

expand all

unified split

install-dependencies.sh

ci/install-dependencies.sh

··· 61 libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \ 62 ${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE 63 64 case "$distro" in 65 ubuntu-*) 66 mkdir --parents "$CUSTOM_PATH"

··· 61 libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \ 62 ${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE 63 64 + # Starting with Ubuntu 25.10, sudo can now be provided via either 65 + # sudo(1) or sudo-rs(1), with the latter being the default. The problem 66 + # is that it does not support `--preserve-env` though, which we rely on 67 + # in our CI. We thus revert back to the C implementation. 68 + if test -f /etc/alternatives/sudo 69 + then 70 + sudo update-alternatives --set sudo /usr/bin/sudo.ws 71 + fi 72 + 73 case "$distro" in 74 ubuntu-*) 75 mkdir --parents "$CUSTOM_PATH"