From b3943604f54239518dfd9dac492e5200f902c719 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 10 Oct 2016 12:22:10 +0200 Subject: .travis.yml: minor optimizations: - make 'pip install --user cpp-coveralls' conditional; - limit no-stdio to single build per operating environment; - omit enable-asan duplicate; Reviewed-by: Richard Levitte --- .travis.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 64cb95d937..9434f877d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,9 @@ language: c cache: ccache before_install: - - pip install --user cpp-coveralls + - if [ -n "$COVERALLS" ]; then + pip install --user cpp-coveralls; + fi; addons: apt: @@ -36,9 +38,6 @@ matrix: - os: linux compiler: gcc env: CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers" COVERALLS="yes" - - os: linux - compiler: clang-3.6 - env: CONFIG_OPTS="enable-asan" - os: linux compiler: clang-3.6 env: CONFIG_OPTS="enable-msan" @@ -48,24 +47,18 @@ matrix: - os: linux compiler: clang-3.6 env: CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2" - - os: linux - compiler: clang-3.6 - env: CONFIG_OPTS="no-stdio" - os: linux compiler: gcc-5 env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC" - - os: linux - compiler: i686-w64-mingw32-gcc - env: CONFIG_OPTS="no-pic" - os: linux compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" - os: linux - compiler: x86_64-w64-mingw32-gcc + compiler: i686-w64-mingw32-gcc env: CONFIG_OPTS="no-pic" - os: linux compiler: x86_64-w64-mingw32-gcc - env: CONFIG_OPTS="no-stdio" BUILDONLY="yes" + env: CONFIG_OPTS="no-pic" exclude: - os: linux compiler: clang -- cgit v1.2.3