kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ps/ci-python-2-deprecation' into maint-2.45 

Unbreak CI jobs so that we do not attempt to use Python 2 that has
been removed from the platform.

* ps/ci-python-2-deprecation:
  ci: fix Python dependency on Ubuntu 24.04
maint
Junio C Hamano 2024-05-31 15:28:18 -07:00
parent 0d7b7484c9 5ca0c455f1
commit 1b2e9068f8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/lib.sh
View File

@ -325,9 +325,13 @@ ubuntu-*)
break break
fi fi


PYTHON_PACKAGE=python2 # Python 2 is end of life, and Ubuntu 23.04 and newer don't actually
if test "$jobname" = linux-gcc # have it anymore. We thus only test with Python 2 on older LTS
# releases.
if "$distro" = "ubuntu-20.04"
then then
PYTHON_PACKAGE=python2
else
PYTHON_PACKAGE=python3 PYTHON_PACKAGE=python3
fi fi
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"