Skip to content

Commit 246cd01

Browse files
committed
Merge branch 'ps/ci-avoid-broken-sudo-on-ubuntu' into seen
* ps/ci-avoid-broken-sudo-on-ubuntu: ci: fix broken jobs on Ubuntu 25.10 caused by switch to sudo-rs(1)
2 parents 5fb7fc8 + fddb484 commit 246cd01

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

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

0 commit comments

Comments
 (0)