summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2017-12-31 16:02:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-03 21:29:18 (GMT)
commit88e00b70330449128d3fe1a074d71ccbe236cf4a (patch)
treebacbc79428af0bcfacf1164c59b83afe1d9f7f12 /ci
parent9cc2c76f5eaab557c42f67b9d574db89fd0865c2 (diff)
downloadgit-88e00b70330449128d3fe1a074d71ccbe236cf4a.zip
git-88e00b70330449128d3fe1a074d71ccbe236cf4a.tar.gz
git-88e00b70330449128d3fe1a074d71ccbe236cf4a.tar.bz2
travis-ci: don't store P4 and Git LFS in the working tree
The Clang and GCC 64 bit Linux build jobs download and store the P4 and Git LFS executables under the current directory, which is the working tree that we are about to build and test. This means that Git commands like 'status' or 'ls-files' would list these files as untracked. The next commit is about to make sure that there are no untracked files present after the build, and the downloaded executables in the working tree are interfering with those upcoming checks. Therefore, let's download P4 and Git LFS in the home directory, outside of the working tree. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/lib-travisci.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index bade716..1543b79 100755
--- a/ci/lib-travisci.sh
+++ b/ci/lib-travisci.sh
@@ -99,8 +99,8 @@ linux-clang|linux-gcc)
export LINUX_P4_VERSION="16.2"
export LINUX_GIT_LFS_VERSION="1.5.2"
- P4_PATH="$(pwd)/custom/p4"
- GIT_LFS_PATH="$(pwd)/custom/git-lfs"
+ P4_PATH="$HOME/custom/p4"
+ GIT_LFS_PATH="$HOME/custom/git-lfs"
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
;;
osx-clang|osx-gcc)