diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:49 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:49 +0900 |
| commit | 2cd4e031216401d495465b7eb3c19038965df4af (patch) | |
| tree | b16faaf787387d767de8951af9abfdc6f0000279 | |
| parent | cb5918aa0d50f50e83787f65c2ddc3dcb10159fe (diff) | |
| parent | c2154953b8d890d86a771e5ea52d52a9392ca081 (diff) | |
| download | git-2cd4e031216401d495465b7eb3c19038965df4af.tar.gz | |
Merge branch 'sg/travis-fixes' into maint
TravisCI build updates.
* sg/travis-fixes:
travis-ci: don't build Git for the static analysis job
travis-ci: fix running P4 and Git LFS tests in Linux build jobs
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | ci/install-dependencies.sh | 10 | ||||
| -rwxr-xr-x | ci/lib-travisci.sh | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index fead995edd..281f101f31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ matrix: packages: - coccinelle before_install: - # "before_script" that builds Git is inherited from base job + before_script: script: ci/run-static-analysis.sh after_failure: - env: Documentation diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index a29246af35..5bd06fe900 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -12,20 +12,18 @@ case "${TRAVIS_OS_NAME:-linux}" in linux) export GIT_TEST_HTTPD=YesPlease - mkdir --parents custom/p4 - pushd custom/p4 + mkdir --parents "$P4_PATH" + pushd "$P4_PATH" wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d" wget --quiet "$P4WHENCE/bin.linux26x86_64/p4" chmod u+x p4d chmod u+x p4 - export PATH="$(pwd):$PATH" popd - mkdir --parents custom/git-lfs - pushd custom/git-lfs + mkdir --parents "$GIT_LFS_PATH" + pushd "$GIT_LFS_PATH" wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs . - export PATH="$(pwd):$PATH" popd ;; osx) diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh index b3ed0a0dda..ac05f1f469 100755 --- a/ci/lib-travisci.sh +++ b/ci/lib-travisci.sh @@ -26,3 +26,11 @@ skip_branch_tip_with_tag () { set -e skip_branch_tip_with_tag + +case "${TRAVIS_OS_NAME:-linux}" in +linux) + P4_PATH="$(pwd)/custom/p4" + GIT_LFS_PATH="$(pwd)/custom/git-lfs" + export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" + ;; +esac |