Unverified Commit 9960ec90 authored by Marcel Raad's avatar Marcel Raad
Browse files

travis: use mbedtls from Xenial 

No need to build it from source anymore.

Closes https://github.com/curl/curl/pull/3779
parent 1ef146a8

.travis.yml

+1 −13
Original line number Diff line number Diff line
@@ -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
@@ -393,17 +393,6 @@ before_script: 
        echo "BoringSSL lib dir: "`pwd` &&

        export LIBS=-lpthread )

      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
@@ -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