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

Git fork

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

Junio C Hamano 2 years ago 1b2e9068 0d7b7484

+6 -2

1 changed file

expand all

unified split

lib.sh

+6 -2

ci/lib.sh

··· 325 break 326 fi 327 328 - PYTHON_PACKAGE=python2 329 - if test "$jobname" = linux-gcc 330 then 331 PYTHON_PACKAGE=python3 332 fi 333 MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"

··· 325 break 326 fi 327 328 + # Python 2 is end of life, and Ubuntu 23.04 and newer don't actually 329 + # have it anymore. We thus only test with Python 2 on older LTS 330 + # releases. 331 + if "$distro" = "ubuntu-20.04" 332 then 333 + PYTHON_PACKAGE=python2 334 + else 335 PYTHON_PACKAGE=python3 336 fi 337 MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"