From: Patrick Steinhardt Date: Fri, 10 Oct 2025 09:41:14 GMT Subject: [PATCH] ci: fix broken jobs on Ubuntu 25.10 caused by switch to sudo-rs(1) Message-ID: <20251010-b4-pks-ci-ubuntu-sudo-rs-v1-1-88cc846d251c@pks.im> Ubuntu 25.10 has been released. One prominent change in this version of Ubuntu is the switch to some Rust-based utilities. Part of this switch is also that Ubuntu now defaults to sudo-rs(1). Unfortunately, this breaks our CI because sudo-rs(1) does not support the `--preserve-env` flag. Let's revert back to the C-based sudo(1) implementation to fix this. Signed-off-by: Patrick Steinhardt --- Hi, this breaks a bunch of our CI jobs, both for GitHub and GitLab. It would probably make sense to fast-track the fix. Thanks! Patrick --- ci/install-dependencies.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 0d3aa496fc..a8dcd9b9bc 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -65,6 +65,15 @@ ubuntu-*|i386/ubuntu-*|debian-*) libsecret-1-dev libpcre2-dev meson ninja-build pkg-config cargo \ ${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE + # Starting with Ubuntu 25.10, sudo can now be provided via either + # sudo(1) or sudo-rs(1), with the latter being the default. The problem + # is that it does not support `--preserve-env` though, which we rely on + # in our CI. We thus revert back to the C implementation. + if test -f /etc/alternatives/sudo + then + sudo update-alternatives --set sudo /usr/bin/sudo.ws + fi + case "$distro" in ubuntu-*) mkdir --parents "$CUSTOM_PATH" --- base-commit: 60f3f52f17cceefa5299709b189ce6fe2d181e7b change-id: 20251010-b4-pks-ci-ubuntu-sudo-rs-8e992b87ddf0