diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-09 08:45:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-09 08:45:36 -0700 |
| commit | 21373511b99093c3417dff7e4b8275278e3ade8a (patch) | |
| tree | 2a4bbed4473f5f370d750d9b06fce72328ed1d15 | |
| parent | b664d36165cc6c98d9f211539d4a83ec53611a0a (diff) | |
| parent | 5ca0c455f1d020156dc352a209fb1a3a6e548e3d (diff) | |
| download | git-21373511b99093c3417dff7e4b8275278e3ade8a.tar.gz | |
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
| -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" |