Skip to content

Commit 7ac1731

Browse files
committed
Merge branch 'ps/ci-avoid-broken-sudo-on-ubuntu'
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)
2 parents 4b71b29 + fddb484 commit 7ac1731

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

ci/install-dependencies.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@ ubuntu-*|i386/ubuntu-*|debian-*)
6565
libsecret-1-dev libpcre2-dev meson ninja-build pkg-config cargo \
6666
${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE
6767

68+
# Starting with Ubuntu 25.10, sudo can now be provided via either
69+
# sudo(1) or sudo-rs(1), with the latter being the default. The problem
70+
# is that it does not support `--preserve-env` though, which we rely on
71+
# in our CI. We thus revert back to the C implementation.
72+
if test -f /etc/alternatives/sudo
73+
then
74+
sudo update-alternatives --set sudo /usr/bin/sudo.ws
75+
fi
76+
6877
case "$distro" in
6978
ubuntu-*)
7079
mkdir --parents "$CUSTOM_PATH"

0 commit comments

Comments
 (0)