diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-11-29 04:41:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-29 04:41:06 +0300 |
| commit | 515ffabccf75c221cbb6bcef7eb8f89f6c832da9 (patch) | |
| tree | b4fe6e44e03325d025cbb22b415789d58fb1c7c8 /ci/lib.sh | |
| parent | 8165c6af118b0b484dedf7df1be19645461db923 (diff) | |
| parent | 0d3507f3e7b74ccbaa6f1ddc282cf467cce0e102 (diff) | |
Merge branch 'jx/ci-ubuntu-fix'
Adjust the GitHub CI to newer ubuntu release.
* jx/ci-ubuntu-fix:
ci: install python on ubuntu
ci: use the same version of p4 on both Linux and macOS
ci: remove the pipe after "p4 -V" to catch errors
github-actions: run gcc-8 on ubuntu-20.04 image
Diffstat (limited to 'ci/lib.sh')
| -rwxr-xr-x | ci/lib.sh | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -226,18 +226,18 @@ export GIT_TEST_CLONE_2GB=true export SKIP_DASHED_BUILT_INS=YesPlease case "$runs_on_pool" in -ubuntu-latest) +ubuntu-*) if test "$jobname" = "linux-gcc-default" then break fi - if [ "$jobname" = linux-gcc ] + PYTHON_PACKAGE=python2 + if test "$jobname" = linux-gcc then - 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 @@ -246,7 +246,6 @@ ubuntu-latest) # were recorded in the Homebrew database upon creating the OS X # image. # Keep that in mind when you encounter a broken OS X build! - export LINUX_P4_VERSION="16.2" export LINUX_GIT_LFS_VERSION="1.5.2" P4_PATH="$HOME/custom/p4" |