Merge branch 'ps/ci-python-2-deprecation' into ps/ci-fuzzers-at-gitlab-fix

* ps/ci-python-2-deprecation:
  ci: fix Python dependency on Ubuntu 24.04
This commit is contained in:
Junio C Hamano 2024-05-09 08:45:36 -07:00
commit 21373511b9

View file

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