From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Oct 2025 05:00:34 +0000 (-0700)
Subject: Merge branch 'ps/ci-avoid-broken-sudo-on-ubuntu'
X-Git-Tag: v2.52.0-rc0~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ac17316205e8313948a94379ce185065517d87d;p=thirdparty%2Fgit.git

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)
---

7ac17316205e8313948a94379ce185065517d87d
diff --cc ci/install-dependencies.sh
index 0d3aa496fc,6668c4df84..a8dcd9b9bc
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@@ -62,9 -58,18 +62,18 @@@ ubuntu-*|i386/ubuntu-*|debian-*
  		make libssl-dev libcurl4-openssl-dev libexpat-dev wget sudo default-jre \
  		tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
  		libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \
 -		libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \
 +		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"