diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-30 21:34:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 21:34:30 -0700 |
| commit | 06df6b5fd92cc7dd4650d2db9f642ce504b56eb8 (patch) | |
| tree | 2d7d8fe2149133a4ae7d11f0b23d9fde1da745ab | |
| parent | Merge branch 'en/typofixes' into master (diff) | |
| parent | ci: use absolute PYTHON_PATH in the Linux jobs (diff) | |
| download | git-06df6b5fd92cc7dd4650d2db9f642ce504b56eb8.tar.gz git-06df6b5fd92cc7dd4650d2db9f642ce504b56eb8.zip | |
Merge branch 'sg/ci-git-path-fix-with-pyenv' into master
CI fixup---tests of Python scripts didn't use the version of Git
that is being tested.
* sg/ci-git-path-fix-with-pyenv:
ci: use absolute PYTHON_PATH in the Linux jobs
| -rwxr-xr-x | ci/lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -184,9 +184,9 @@ linux-clang|linux-gcc) if [ "$jobname" = linux-gcc ] then export CC=gcc-8 - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)" + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3" else - MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)" + MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2" fi export GIT_TEST_HTTPD=true |