Skip to content

Commit 2137351

Browse files
committed
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
2 parents b664d36 + 5ca0c45 commit 2137351

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

ci/lib.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,13 @@ ubuntu-*)
325325
break
326326
fi
327327

328-
PYTHON_PACKAGE=python2
329-
if test "$jobname" = linux-gcc
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"
330332
then
333+
PYTHON_PACKAGE=python2
334+
else
331335
PYTHON_PACKAGE=python3
332336
fi
333337
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"

0 commit comments

Comments
 (0)