travis-ci: express Linux/OS X dependency versions more clearly
The Git Travis CI OSX build always installs the latest versions of Git LFS and Perforce via brew and the Linux build installs fixed versions. Consequently new LFS/Perforce versions can break the OS X build even if there is no change in Git. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Lars Schneider committed
Apr 28, 2016 at 08:26 UTC
3d319f2c63c5a778b8f0aa8b3c11f1335d84e29b
1 file changed
+10
-7
.travis.yml
+10
-7
@@ -22,8 +22,11 @@ addons:
22
env:
23
global:
24
- DEVELOPER=1
25
- - P4_VERSION="16.1"
26
- - GIT_LFS_VERSION="1.2.0"
25
+ # The Linux build installs the defined dependency versions below.
26
+ # The OS X build installs the latest available versions. Keep that
27
+ # in mind when you encounter a broken OS X build!
28
+ - LINUX_P4_VERSION="16.1"
29
+ - LINUX_GIT_LFS_VERSION="1.2.0"
30
- DEFAULT_TEST_TARGET=prove
31
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
32
- GIT_TEST_OPTS="--verbose --tee"
@@ -38,17 +41,17 @@ before_install:
41
linux)
42
mkdir --parents custom/p4
43
pushd custom/p4
41
- wget --quiet http://filehost.perforce.com/perforce/r$P4_VERSION/bin.linux26x86_64/p4d
42
- wget --quiet http://filehost.perforce.com/perforce/r$P4_VERSION/bin.linux26x86_64/p4
44
+ wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
45
+ wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4
46
chmod u+x p4d
47
chmod u+x p4
48
export PATH="$(pwd):$PATH"
49
popd
50
mkdir --parents custom/git-lfs
51
pushd custom/git-lfs
49
- wget --quiet https://github.com/github/git-lfs/releases/download/v$GIT_LFS_VERSION/git-lfs-linux-amd64-$GIT_LFS_VERSION.tar.gz
50
- tar --extract --gunzip --file "git-lfs-linux-amd64-$GIT_LFS_VERSION.tar.gz"
51
- cp git-lfs-$GIT_LFS_VERSION/git-lfs .
52
+ wget --quiet https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz
53
+ tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
54
+ cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
55
export PATH="$(pwd):$PATH"
56
popd
57
;;