From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: sschuberth@gmail.com, gitster@pobox.com, ben.woosley@gmail.com,
Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v3 2/3] travis-ci: express Linux/OS X dependency versions more clearly
Date: Sun, 24 Apr 2016 20:58:11 +0200 [thread overview]
Message-ID: <1461524292-20490-3-git-send-email-larsxschneider@gmail.com> (raw)
In-Reply-To: <1461524292-20490-1-git-send-email-larsxschneider@gmail.com>
From: Lars Schneider <larsxschneider@gmail.com>
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 brake the OS X build even if there is no change in
Git.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
.travis.yml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4acf617..1fdcec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,11 @@ addons:
env:
global:
- DEVELOPER=1
- - P4_VERSION="16.1"
- - GIT_LFS_VERSION="1.2.0"
+ # The Linux build installs the defined dependency versions below.
+ # The OS X build installs the latest available versions. Keep that
+ # in mind when you encounter a broken OS X build!
+ - LINUX_P4_VERSION="16.1"
+ - LINUX_GIT_LFS_VERSION="1.2.0"
- DEFAULT_TEST_TARGET=prove
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- GIT_TEST_OPTS="--verbose --tee"
@@ -38,17 +41,17 @@ before_install:
linux)
mkdir --parents custom/p4
pushd custom/p4
- wget --quiet http://filehost.perforce.com/perforce/r$P4_VERSION/bin.linux26x86_64/p4d
- wget --quiet http://filehost.perforce.com/perforce/r$P4_VERSION/bin.linux26x86_64/p4
+ wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
+ wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/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
- wget --quiet https://github.com/github/git-lfs/releases/download/v$GIT_LFS_VERSION/git-lfs-linux-amd64-$GIT_LFS_VERSION.tar.gz
- tar --extract --gunzip --file "git-lfs-linux-amd64-$GIT_LFS_VERSION.tar.gz"
- cp git-lfs-$GIT_LFS_VERSION/git-lfs .
+ 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
+ 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
;;
--
2.5.1
next prev parent reply other threads:[~2016-04-24 18:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-24 18:58 [PATCH v3 0/3] git-p4: fix Git LFS pointer parsing larsxschneider
2016-04-24 18:58 ` [PATCH v3 1/3] travis-ci: update Git-LFS and P4 to the latest version larsxschneider
2016-04-24 18:58 ` larsxschneider [this message]
2016-04-25 4:40 ` [PATCH v3 2/3] travis-ci: express Linux/OS X dependency versions more clearly Eric Sunshine
2016-04-25 7:05 ` Lars Schneider
2016-04-24 18:58 ` [PATCH v3 3/3] git-p4: fix Git LFS pointer parsing larsxschneider
2016-04-24 19:16 ` Sebastian Schuberth
2016-04-25 7:33 ` Lars Schneider
2016-04-25 7:35 ` Sebastian Schuberth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461524292-20490-3-git-send-email-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=ben.woosley@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sschuberth@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).