diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:41:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-14 13:41:38 -0700 |
| commit | 73f63c39ad2f9fca46dc530d8bf8603bbbd9a673 (patch) | |
| tree | 86e300604106cfad17947379754f9932573d5400 | |
| parent | 2ba32befc9c71a5ba9314d9661d16639883ce4d4 (diff) | |
| parent | fddb4842552b70a8b46a9dd8a2a450b973d3dd1e (diff) | |
Merge branch 'ps/ci-avoid-broken-sudo-on-ubuntu' into maint-2.51
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)
| -rwxr-xr-x | ci/install-dependencies.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d061a47293..6668c4df84 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -61,6 +61,15 @@ ubuntu-*|i386/ubuntu-*|debian-*) libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \ ${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" |