diff options
| author | Jiang Xin <zhiyou.jx@alibaba-inc.com> | 2022-11-25 17:59:54 +0800 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2023-03-12 20:31:54 +0100 |
| commit | a69043d51083151c538c3f2da0fc312f8af35edd (patch) | |
| tree | 5add4ab2926142d6d0883902aa4006478cdee024 | |
| parent | 79e0626b39a4aa3754ec0719b3f67296ad39e724 (diff) | |
| download | git-a69043d51083151c538c3f2da0fc312f8af35edd.tar.gz | |
ci: install python on ubuntu
Python is missing from the default ubuntu-22.04 runner image, which
prevents git-p4 from working. To install python on ubuntu, we need
to provide the correct package names:
* On Ubuntu 18.04 (bionic), "/usr/bin/python2" is provided by the
"python" package, and "/usr/bin/python3" is provided by the "python3"
package.
* On Ubuntu 20.04 (focal) and above, "/usr/bin/python2" is provided by
the "python2" package which has a different name from bionic, and
"/usr/bin/python3" is provided by "python3".
Since the "ubuntu-latest" runner image has a higher version, its
safe to use "python2" or "python3" package name.
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | ci/install-dependencies.sh | 2 | ||||
| -rwxr-xr-x | ci/lib.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 19c5e8735d..2d54427175 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -16,7 +16,7 @@ linux-clang|linux-gcc) sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" sudo apt-get -q update sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ - $UBUNTU_COMMON_PKGS + $UBUNTU_COMMON_PKGS $PYTHON_PACKAGE case "$jobname" in linux-gcc) sudo apt-get -q -y install gcc-8 @@ -184,13 +184,13 @@ export SKIP_DASHED_BUILT_INS=YesPlease case "$jobname" in linux-clang|linux-gcc) + PYTHON_PACKAGE=python2 if [ "$jobname" = linux-gcc ] then export CC=gcc-8 - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3" - else - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2" + PYTHON_PACKAGE=python3 fi + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" export GIT_TEST_HTTPD=true |