diff options
| author | Marcel Raad <Marcel.Raad@teamviewer.com> | 2019-04-14 14:48:37 +0200 |
|---|---|---|
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2019-04-15 11:22:53 +0200 |
| commit | 9960ec9003b38d6e0e70850bdc9803f871c127ab (patch) | |
| tree | 9d7d49c688287fc06551424ad6c04cf963e6c8cc /.travis.yml | |
| parent | 1ef146a8db9742364fe016a5c509e3fa89231f70 (diff) | |
travis: use mbedtls from Xenial
No need to build it from source anymore.
Closes https://github.com/curl/curl/pull/3779
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index bc83e21d2..9a27d925e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: c sudo: required cache: directories: - - $HOME/mbedtls-mbedtls-2.8.0 - $HOME/wolfssl-4.0.0-stable - $HOME/nghttp2-1.34.0 @@ -159,6 +158,7 @@ matrix: - *common_packages - clang-7 - libpsl-dev + - libmbedtls-dev - os: linux compiler: clang dist: xenial @@ -395,17 +395,6 @@ before_script: fi - | if [ $TRAVIS_OS_NAME = linux ]; then - if [ ! -e $HOME/mbedtls-mbedtls-2.8.0/library/libmbedtls.a ]; then - (cd $HOME && \ - curl -LO https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.8.0.tar.gz && \ - tar -xzf mbedtls-2.8.0.tar.gz && \ - cd mbedtls-mbedtls-2.8.0 && \ - cmake . -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_C_FLAGS=-fPIC && \ - make) - fi - fi - - | - if [ $TRAVIS_OS_NAME = linux ]; then if [ ! -e $HOME/wolfssl-4.0.0-stable/Makefile ]; then (cd $HOME && \ curl -LO https://github.com/wolfSSL/wolfssl/archive/v4.0.0-stable.tar.gz && \ @@ -430,7 +419,6 @@ before_script: fi - | if [ $TRAVIS_OS_NAME = linux ]; then - (cd $HOME/mbedtls-mbedtls-2.8.0 && sudo make install) (cd $HOME/wolfssl-4.0.0-stable && sudo make install) (cd $HOME/nghttp2-1.34.0 && sudo make install) fi |