diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-03-27 08:55:54 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-03-27 08:55:54 +0100 |
| commit | 13264089a19d32746192c94bf3b51f4ca82a3b54 (patch) | |
| tree | a97435ae91b04269924e29a15dbc2bc45c464963 | |
| parent | 9915d28d80ac3c9efc28d8801153bc9450378b85 (diff) | |
| download | curl-bagder/travis-libssh2-git.tar.gz | |
fixup configure libssh2 without examplesbagder/travis-libssh2-git
only install libssh2 for builds using libssh2
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index d3fe78871..468c766b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ matrix: env: - T=normal C="--with-gssapi --with-libssh2" CHECKSRC=1 - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" + - LIBSSH2=1 - os: linux compiler: gcc dist: trusty @@ -142,7 +143,9 @@ matrix: - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" - os: osx compiler: gcc - env: T=debug C=--with-libssh2=/usr/local + env: + - T=debug C=--with-libssh2=/usr/local + - LIBSSH2=1 - os: osx compiler: gcc env: T=debug C=--enable-ares @@ -258,7 +261,7 @@ before_script: if [ ! -e "$HOME/libssh2/Makefile" ]; then (cd $HOME && git clone --depth=1 https://github.com/libssh2/libssh2.git && - cd libssh2 && ./buildconf && ./configure && make) + cd libssh2 && ./buildconf && ./configure --disable-examples-build && make) fi - | if [ $TRAVIS_OS_NAME = linux ]; then @@ -341,7 +344,9 @@ before_script: (cd $HOME/mesalink-0.7.1 && sudo make install) (cd $HOME/nghttp2-1.34.0 && sudo make install) fi - cd $HOME/libssh2 && sudo make install + if [ $LIBSSH2 = 1 ]; then + cd $HOME/libssh2 && sudo make install + fi script: - | |