diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-03-16 10:06:34 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-03-16 11:00:29 +0100 |
| commit | c44cf858f2fd35b38644ad3683766094293bdbf7 (patch) | |
| tree | a418caa5f849a5583a6f04019d21acf26e419d2c | |
| parent | 0785a7776747de7b91def7961e688cc37091b896 (diff) | |
| download | curl-c44cf858f2fd35b38644ad3683766094293bdbf7.tar.gz | |
travis: use ubuntu nghttp2 package instead of build our own
Closes #6751
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | scripts/travis/before_script.sh | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 939242643..1153bd59d 100644 --- 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 7fc306517..181b2e286 100755 --- 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 |