diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-13 10:19:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-13 10:19:46 -0700 |
| commit | dddddea4b52efabbeeefe0aa1fb6362dd6001a53 (patch) | |
| tree | a0c981fd313f9c2a5fd64d863f59b8927d908a33 | |
| parent | Merge branch 'tb/attr-limits' (diff) | |
| parent | ci: fix Python dependency on Ubuntu 24.04 (diff) | |
| download | git-dddddea4b52efabbeeefe0aa1fb6362dd6001a53.tar.gz git-dddddea4b52efabbeeefe0aa1fb6362dd6001a53.zip | |
Merge branch 'ps/ci-python-2-deprecation'
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
| -rwxr-xr-x | ci/lib.sh | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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" |