From 252e9f1061b045f352447032f2425317c1cdb20f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 11:52:13 +0200 Subject: [PATCH 1/7] travis: install nghttp2 on linux builds --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8a89072b592d05..ab42c4f1faa089 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update > /dev/null; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew reinstall libtool > /dev/null; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl libidn rtmpdump libssh2 c-ares libmetalink libressl nghttp2; fi + - if [ $TRAVIS_OS_NAME = linux ]; then curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz | tar xzf - && (cd nghttp2-1.24.0 && ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); fi before_script: - ./buildconf From b2eea8879dfe091683306b85a0e8287bca86cce3 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 12:41:45 +0200 Subject: [PATCH 2/7] travis: libev-dev is a pre-req to the nghttp2 build --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ab42c4f1faa089..49910b7e5c3d37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,12 @@ install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update > /dev/null; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew reinstall libtool > /dev/null; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl libidn rtmpdump libssh2 c-ares libmetalink libressl nghttp2; fi - - if [ $TRAVIS_OS_NAME = linux ]; then curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz | tar xzf - && (cd nghttp2-1.24.0 && ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); fi + - if [ $TRAVIS_OS_NAME = linux ]; then + sudo apt-get install -qq libev-dev; + curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz | + tar xzf - && + (cd nghttp2-1.24.0 && ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); + fi before_script: - ./buildconf From 9ecd09023145697f5ec8a05b54487d4a39b0334b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 12:48:48 +0200 Subject: [PATCH 3/7] travis: sudo is required now for installation --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 49910b7e5c3d37..38033cd3c09b3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: c -sudo: false +sudo: required addons: apt: sources: From 1ef07423e6bcecee9739464823d2d971e685080d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 13:48:13 +0200 Subject: [PATCH 4/7] travis: and install c-ares for the nghttp2 build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38033cd3c09b3c..9d9d57366795ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew reinstall libtool > /dev/null; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl libidn rtmpdump libssh2 c-ares libmetalink libressl nghttp2; fi - if [ $TRAVIS_OS_NAME = linux ]; then - sudo apt-get install -qq libev-dev; + sudo apt-get install -qq libev-dev libc-ares-dev; curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz | tar xzf - && (cd nghttp2-1.24.0 && ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); From 007386db7c45e071e71b01359da3643266fdbe7b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 14:43:31 +0200 Subject: [PATCH 5/7] travis: install and use g++ 4.8 for the nghttp2 build --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d9d57366795ea..9e7474f2330c20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,8 @@ install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew reinstall libtool > /dev/null; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl libidn rtmpdump libssh2 c-ares libmetalink libressl nghttp2; fi - if [ $TRAVIS_OS_NAME = linux ]; then - sudo apt-get install -qq libev-dev libc-ares-dev; + sudo apt-get install -qq libev-dev libc-ares-dev g++-4.8 libstdc++-4.8-dev; + export CXX="g++-4.8" curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz | tar xzf - && (cd nghttp2-1.24.0 && ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); From 2a1283e97c8039145e1b11cc57b4aa223f4ae58e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 14:47:13 +0200 Subject: [PATCH 6/7] travis: fix export syntax error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9e7474f2330c20..619368b1826d3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl libidn rtmpdump libssh2 c-ares libmetalink libressl nghttp2; fi - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install -qq libev-dev libc-ares-dev g++-4.8 libstdc++-4.8-dev; - export CXX="g++-4.8" + export CXX="g++-4.8"; curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz | tar xzf - && (cd nghttp2-1.24.0 && ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); From f648a20360c87d42d9ba05745f70cc08267a4dd2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Jul 2017 14:58:14 +0200 Subject: [PATCH 7/7] travis: move the apt installs to 'packages', pass CXX to configure --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 619368b1826d3b..58205dad26d6ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,10 @@ addons: - lcov - clang-3.7 - valgrind + - libev-dev + - libc-ares-dev + - g++-4.8 + - libstdc++-4.8-dev matrix: include: @@ -47,11 +51,9 @@ install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew reinstall libtool > /dev/null; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl libidn rtmpdump libssh2 c-ares libmetalink libressl nghttp2; fi - if [ $TRAVIS_OS_NAME = linux ]; then - sudo apt-get install -qq libev-dev libc-ares-dev g++-4.8 libstdc++-4.8-dev; - export CXX="g++-4.8"; curl -L https://github.com/nghttp2/nghttp2/releases/download/v1.24.0/nghttp2-1.24.0.tar.gz | tar xzf - && - (cd nghttp2-1.24.0 && ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); + (cd nghttp2-1.24.0 && CXX="g++-4.8" ./configure --prefix=/usr --disable-threads --enable-app && make && sudo make install); fi before_script: