From f8e01fe2faf5054f1650fc436be4152c65f8445a Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sun, 1 May 2016 18:37:06 +0500 Subject: [PATCH] reworked packages install to "apt" plugin --- .travis.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0e267f..bc2662b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,12 @@ matrix: env: CHOST=x86_64-w64-mingw32 m=mingw64 exclude: - compiler: gcc - -install: - - sudo apt-get update -qq - - sudo apt-get install -qq -y gcc-mingw-w64 man2html cppcheck + +addons: + apt: + packages: + - gcc-mingw-w64 + - cppcheck before_script: - unset CC; unset CXX @@ -25,10 +27,13 @@ before_script: script: - cppcheck --force --enable=warning,missingInclude --error-exitcode=1 . >build.log 2>&1 || (cat build.log && exit 1) - mkdir image - - wget http://www.openssl.org/source/openssl-1.0.1r.tar.gz && tar zxf openssl-1.0.1r.tar.gz && cd openssl-1.0.1r + - wget https://www.openssl.org/source/openssl-1.0.1r.tar.gz && tar zxf openssl-1.0.1r.tar.gz && cd openssl-1.0.1r - ./Configure --prefix=/ --cross-compile-prefix=${CHOST}- shared $m no-multilib no-capieng --openssldir=/etc/ssl --libdir=/lib -static-libgcc >build.log 2>&1 || (cat build.log && exit 1) - make install INSTALL_PREFIX="${HOME}/image" INSTALLTOP="/" MANDIR="/tmp" >build.log 2>&1 || (cat build.log && exit 1) - cd .. && autoreconf -i -v - export OPENSSL_CRYPTO_CFLAGS="-I${HOME}/image/include" - export OPENSSL_CRYPTO_LIBS="-L${HOME}/image/lib -lcrypto" - ./configure --prefix=/ --libdir=/lib --host=$CHOST --build=x86_64-pc-linux-gnu --program-prefix='' && make + +cache: + -apt