averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ps/ci-avoid-broken-sudo-on-ubuntu'

Browse Source 
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)
This commit is contained in:
Junio C Hamano
2025-10-13 22:00:34 -07:00
parent 4b71b29477 fddb484255
commit 7ac1731620
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ci/install-dependencies.sh
View File

@@ -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"