From 1dba3162c4cade394ee49de92b38866d0cde3053 Mon Sep 17 00:00:00 2001 From: gabime Date: Tue, 14 Aug 2018 01:19:29 +0300 Subject: [PATCH] Fixed travis --- .travis.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53511930..b0dbcba7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,11 +82,17 @@ matrix: addons: *clang6 -before_install: +before_script: - if [ -n "$GCC_VERSION" ]; then export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}"; fi - if [ -n "$CLANG_VERSION" ]; then export CXX="clang++-${CLANG_VERSION}" CC="clang-${CLANG_VERSION}"; fi + - which $CXX + - which $CC + - which valgrind + - $CXX --version + - cmake --version + - valgrind --version -install: +script: - cd ${TRAVIS_BUILD_DIR} - mkdir -p build && cd build - | @@ -98,18 +104,10 @@ install: -DSPDLOG_BUILD_BENCH=OFF \ -DSPDLOG_SANITIZE_ADDRESS=$ASAN \ -DSPDLOG_SANITIZE_THREAD=$TSAN - - make VERBOSE=1 -j2 - -before_script: - - which $CXX - - which $CC - - which valgrind - - $CXX --version - - cmake --version - - valgrind --version - -script: + - make VERBOSE=1 -j2 - ctest -j2 --output-on-failure + + notifications: email: false