Problem: Travis installs packages when not needed

Solution: narrow down the matrix to install valgrind and lcov only
for the test runs that use them.
CMake is part of the default image so no need to install it at all.
This commit is contained in:
Luca Boccassi 2016-12-26 21:30:16 +01:00
parent 5871ea5df8
commit 1f86019e3f

View File

@ -14,30 +14,28 @@ env:
- BUILD_TYPE=cmake CURVE=tweetnacl - BUILD_TYPE=cmake CURVE=tweetnacl
- BUILD_TYPE=default CURVE=libsodium - BUILD_TYPE=default CURVE=libsodium
- BUILD_TYPE=default - BUILD_TYPE=default
- BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
- BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
matrix: matrix:
exclude:
- env: BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
os: osx
- env: BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
os: osx
include: include:
- env: BUILD_TYPE=default CURVE=tweetnacl IPv6=ON - env: BUILD_TYPE=default CURVE=tweetnacl IPv6=ON
os: linux os: linux
dist: precise dist: precise
sudo: false sudo: false
- env: BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
sudo: required os: linux
addons:
addons:
apt: apt:
packages: packages:
- cmake
- lcov - lcov
- env: BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
os: linux
addons:
apt:
packages:
- valgrind - valgrind
sudo: required
before_install: before_install:
- if [ $TRAVIS_OS_NAME == "osx" ] ; then brew update; brew install binutils ; fi - if [ $TRAVIS_OS_NAME == "osx" ] ; then brew update; brew install binutils ; fi
# workaround for Travis OSX CI bug, hasn't been fixed in a month so time for a hack # workaround for Travis OSX CI bug, hasn't been fixed in a month so time for a hack