travis: use ubuntu nghttp2 package instead of build our own

Closes #6751

diff --git a/.travis.yml b/.travis.yml
index 93924264360be09ee2b2ed025c902e12b65f13bd..1153bd59dd2ade6ceeefa103967ceef224d4e25f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ cache:
   directories:
   - $HOME/wolfssl-4.7.0-stable
   - $HOME/mesalink-1.0.0
-  - $HOME/nghttp2-1.39.2
 
 env:
   global:
@@ -48,6 +47,7 @@ addons:
     - python-impacket
     - ninja-build
     - libgsasl7-dev
+    - libnghttp2-dev
 
 jobs:
   include:

diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh
index 7fc306517233e614af166aea5db557263b402802..181b2e286f230b9e413d59393752ae3eddbd2144 100755 (executable)
--- a/scripts/travis/before_script.sh
+++ b/scripts/travis/before_script.sh
@@ -175,16 +175,4 @@ if [ $TRAVIS_OS_NAME = linux ]; then
     sudo make install
 
   fi
-
-  if [ ! -e $HOME/nghttp2-1.39.2/Makefile ]; then
-    cd $HOME
-    curl -LO https://github.com/nghttp2/nghttp2/releases/download/v1.39.2/nghttp2-1.39.2.tar.gz
-    tar -xzf nghttp2-1.39.2.tar.gz
-    cd nghttp2-1.39.2
-    CXX="g++-8" CC="gcc-8" CFLAGS="" LDFLAGS="" LIBS="" ./configure --disable-threads --enable-app
-    make
-  fi
-
-  cd $HOME/nghttp2-1.39.2
-  sudo make install
 fi