diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-31 15:28:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-31 15:28:19 -0700 |
| commit | 1b2e9068f82beea34e11f4183f13e5c0b7917f01 (patch) | |
| tree | e2e8c75d85123b9600eda536e5edd51fe55803db /ci | |
| parent | 0d7b7484c9b3e110587e9bdc942d0bff6a925c25 (diff) | |
| parent | 5ca0c455f1d020156dc352a209fb1a3a6e548e3d (diff) | |
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
Diffstat (limited to 'ci')
| -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" |