diff options
| author | Daiki Ueno <dueno@redhat.com> | 2020-03-29 15:13:04 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-03-31 14:39:21 +0200 |
| commit | c3b865ea385281ca83f33191e413c83c344ba14e (patch) | |
| tree | f047a0aad236ce790f25564c7e96930453114d6a | |
| parent | 0736ee73d346a521ad10c9bcce5839386a1cc47a (diff) | |
| download | curl-c3b865ea385281ca83f33191e413c83c344ba14e.tar.gz | |
CI: add build with ngtcp2 + gnutls on Travis CI
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rwxr-xr-x | scripts/travis/before_script.sh | 30 |
2 files changed, 48 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 88cb83571..f45565fe6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -152,6 +152,30 @@ matrix: - libbrotli-dev - os: linux compiler: gcc + dist: xenial + env: + - T=novalgrind NGTCP2=yes GNUTLS=yes C="PKG_CONFIG_PATH=$HOME/ngbuild --without-ssl --with-gnutls=$HOME/ngbuild --with-ngtcp2=$HOME/ngbuild --with-nghttp3=$HOME/ngbuild --enable-alt-svc" NOTESTS= + - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" + addons: + apt: + sources: + - *common_sources + packages: + - *common_packages + - libpsl-dev + - libbrotli-dev + - autogen + - automake + - autopoint + - bison + - gperf + - libgmp-dev + - libopts25-dev + - libp11-kit-dev + - libtasn1-6-dev + - nettle-dev + - os: linux + compiler: gcc dist: bionic env: - T=debug-wolfssl C="--with-wolfssl --without-ssl" diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh index 32fc4b45a..4e8164caf 100755 --- a/scripts/travis/before_script.sh +++ b/scripts/travis/before_script.sh @@ -25,12 +25,30 @@ set -eo pipefail ./buildconf if [ "$NGTCP2" = yes ]; then - cd $HOME - git clone --depth 1 -b OpenSSL_1_1_1d-quic-draft-27 https://github.com/tatsuhiro-t/openssl possl - cd possl - ./config enable-tls1_3 --prefix=$HOME/ngbuild - make - make install_sw + if [ "$TRAVIS_OS_NAME" = linux -a "$GNUTLS" ]; then + cd $HOME + git clone --depth 1 https://gitlab.com/gnutls/nettle.git + cd nettle + ./.bootstrap + ./configure LDFLAGS="-Wl,-rpath,$HOME/ngbuild/lib" --disable-documentation --prefix=$HOME/ngbuild + make + make install + + cd $HOME + git clone --depth 1 -b tmp-quic https://gitlab.com/gnutls/gnutls.git pgtls + cd pgtls + ./bootstrap + ./configure PKG_CONFIG_PATH=$HOME/ngbuild/lib/pkgconfig LDFLAGS="-Wl,-rpath,$HOME/ngbuild/lib" --with-included-libtasn1 --with-included-unistring --disable-guile --disable-doc --prefix=$HOME/ngbuild + make + make install + else + cd $HOME + git clone --depth 1 -b OpenSSL_1_1_1d-quic-draft-27 https://github.com/tatsuhiro-t/openssl possl + cd possl + ./config enable-tls1_3 --prefix=$HOME/ngbuild + make + make install_sw + fi cd $HOME git clone --depth 1 https://github.com/ngtcp2/nghttp3 |