diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:30 -0800 |
| commit | f62b471d219ffabcd2adf28d3df5cd5bb9aad851 (patch) | |
| tree | 0113cfae37f985e9a6f034d6bc973026c341fe44 /ci/install-dependencies.sh | |
| parent | 06358125b81d9657b06dea0233ea0add331a2a70 (diff) | |
| parent | 4f263666791e76adae0128641fa362179b6caa6d (diff) | |
| download | git-f62b471d219ffabcd2adf28d3df5cd5bb9aad851.tar.gz | |
Merge branch 'sg/travis-fixes'
Assorted updates for TravisCI integration.
* sg/travis-fixes:
travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output
travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'
travis-ci: move setting environment variables to 'ci/lib-travisci.sh'
travis-ci: introduce a $jobname variable for 'ci/*' scripts
Diffstat (limited to 'ci/install-dependencies.sh')
| -rwxr-xr-x | ci/install-dependencies.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 5bd06fe900..75a9fd2475 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -8,10 +8,8 @@ P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION -case "${TRAVIS_OS_NAME:-linux}" in -linux) - export GIT_TEST_HTTPD=YesPlease - +case "$jobname" in +linux-clang|linux-gcc) mkdir --parents "$P4_PATH" pushd "$P4_PATH" wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d" @@ -26,7 +24,7 @@ linux) cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs . popd ;; -osx) +osx-clang|osx-gcc) brew update --quiet # Uncomment this if you want to run perf tests: # brew install gnu-time |