From 2891d7f2c1edbcbad61a649b5ecb00c02b32cad6 Mon Sep 17 00:00:00 2001 From: John McNamara Date: Mon, 14 Aug 2017 21:13:11 +0100 Subject: [PATCH] Fix travis minizip build. --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d71f03a3..0ef2aae0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: c +dist: trusty compiler: - clang @@ -8,20 +9,23 @@ env: - CFLAGS='-Werror' - NO_VALGRIND=1 USE_STANDARD_TMPFILE=1 CFLAGS='-Werror' - NO_VALGRIND=1 CFLAGS='-Werror -m32' - -# Minizip not currently availavle in TravisCI -# - NO_VALGRIND=1 USE_SYSTEM_MINIZIP=1 CFLAGS='-Werror' + - NO_VALGRIND=1 USE_SYSTEM_MINIZIP=1 CFLAGS='-Werror' install: - sudo pip install pytest - sudo apt-get update - sudo apt-get install -y gcc-multilib - sudo apt-get install -y zlib1g-dev -# - sudo apt-get install -y libminizip-dev + - sudo apt-get install -y libminizip-dev - sudo apt-get install -y zlib1g-dev:i386 - sudo apt-get install -y gcc - sudo apt-get install -y valgrind + - wget http://mirrors.kernel.org/ubuntu/pool/universe/m/minizip/libminizip-dev_1.1-8_amd64.deb + - wget http://mirrors.kernel.org/ubuntu/pool/universe/m/minizip/libminizip1_1.1-8_amd64.deb + - sudo dpkg -i libminizip1_1.1-8_amd64.deb + - sudo dpkg -i libminizip-dev_1.1-8_amd64.deb + script: - make V=1 - make test_functional V=1