undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: install python on ubuntu

Browse Source 
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>
This commit is contained in:
Jiang Xin 2022-11-25 17:59:54 +08:00 committed by Johannes Schindelin
parent 79e0626b39
commit a69043d510
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/install-dependencies.sh
View File

@ -16,7 +16,7 @@ linux-clang|linux-gcc)
sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
sudo apt-get -q update sudo apt-get -q update
sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
$UBUNTU_COMMON_PKGS $UBUNTU_COMMON_PKGS $PYTHON_PACKAGE
case "$jobname" in case "$jobname" in
linux-gcc) linux-gcc)
sudo apt-get -q -y install gcc-8 sudo apt-get -q -y install gcc-8

6
ci/lib.sh
View File

@ -184,13 +184,13 @@ export SKIP_DASHED_BUILT_INS=YesPlease
case "$jobname" in case "$jobname" in
linux-clang|linux-gcc) linux-clang|linux-gcc)
PYTHON_PACKAGE=python2
if [ "$jobname" = linux-gcc ] if [ "$jobname" = linux-gcc ]
then then
export CC=gcc-8 export CC=gcc-8
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3" PYTHON_PACKAGE=python3
else
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2"
fi fi
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"
export GIT_TEST_HTTPD=true export GIT_TEST_HTTPD=true