Skip to content

Commit 8a82514

Browse files
committed
Merge branch 'ps/ci-avoid-broken-sudo-on-ubuntu' into HEAD
* ps/ci-avoid-broken-sudo-on-ubuntu: ci: fix broken jobs on Ubuntu 25.10 caused by switch to sudo-rs(1)
2 parents de89a3a + fddb484 commit 8a82514

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
@@ -61,6 +61,15 @@ ubuntu-*|i386/ubuntu-*|debian-*)
6161
libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \
6262
${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE
6363

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+
6473
case "$distro" in
6574
ubuntu-*)
6675
mkdir --parents "$CUSTOM_PATH"

0 commit comments

Comments
 (0)