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

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"