diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:24 -0800 |
| commit | d27381eeeb451fd3e2072a069c19dcc900e8ae3d (patch) | |
| tree | 07f0e9da8b4e9e08109ac99603cba107a228e226 | |
| parent | a274e0a036ea886a31f8b216564ab1b4a3142f6c (diff) | |
| parent | 5f703e8f023f080972e9ed1413ffb98031af4da2 (diff) | |
| download | git-d27381eeeb451fd3e2072a069c19dcc900e8ae3d.tar.gz git-d27381eeeb451fd3e2072a069c19dcc900e8ae3d.tar.xz | |
Merge branch 'ls/travis-update-p4-and-lfs' into maint
The default Travis-CI configuration specifies newer P4 and GitLFS.
* ls/travis-update-p4-and-lfs:
travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux build
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 0b2ea5c3e..3843967a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,8 @@ env: # 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" + - LINUX_P4_VERSION="16.2" + - LINUX_GIT_LFS_VERSION="1.5.2" - DEFAULT_TEST_TARGET=prove - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save" - GIT_TEST_OPTS="--verbose-log" |