mirror of
https://github.com/git/git.git
synced 2024-09-19 03:02:51 +02:00
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
This commit is contained in:
commit
1b2e9068f8
@ -325,9 +325,13 @@ ubuntu-*)
|
||||
break
|
||||
fi
|
||||
|
||||
PYTHON_PACKAGE=python2
|
||||
if test "$jobname" = linux-gcc
|
||||
# Python 2 is end of life, and Ubuntu 23.04 and newer don't actually
|
||||
# have it anymore. We thus only test with Python 2 on older LTS
|
||||
# releases.
|
||||
if "$distro" = "ubuntu-20.04"
|
||||
then
|
||||
PYTHON_PACKAGE=python2
|
||||
else
|
||||
PYTHON_PACKAGE=python3
|
||||
fi
|
||||
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"
|
||||
|
Loading…
Reference in New Issue
Block a user