From 61e0c40a6a04c7b64f0abfc1bc1e0789b6f0e0d2 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 10 Jan 2019 11:20:21 +0100 Subject: [PATCH] Now that it run on jenkins, disable sonar analysis on travis. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b58fffc302..37931bf9bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,8 @@ script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON .; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake -Denable_model-checking=ON -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON . || (echo XXX CMakeOutput.log; cat /home/travis/build/simgrid/simgrid/CMakeFiles/CMakeOutput.log; echo XXX CMakeError.log;cat /home/travis/build/simgrid/simgrid/CMakeFiles/CMakeError.log; exit 1) ; fi # run make and ctest in the sonar wrapper on master/linux; run it directly in PR or OSX - - if [[ -e Makefile ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then ./tools/internal/travis-sonarqube.sh make -j4 VERBOSE=1; else make -j4 VERBOSE=1 && ctest -j4 --output-on-failure ; fi + # - if [[ -e Makefile ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then ./tools/internal/travis-sonarqube.sh make -j4 VERBOSE=1; else make -j4 VERBOSE=1 && ctest -j4 --output-on-failure ; fi + - make -j4 VERBOSE=1 && ctest -j4 --output-on-failure notifications: recipients: - martin.quinson@ens-rennes.fr -- 2.20.1