From 7785f2a9dc1ae981022cffd3d679f818a54a9e1f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 27 May 2016 16:22:14 +0200 Subject: [PATCH] travis is unable to compile MC, so adapt sonar no need to build twice, after all --- .travis.yml | 10 ++++------ tools/internal/travis-sonarqube.sh | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index e112b5a130..7367be0b42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,15 +44,13 @@ addons: before_install: - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo add-apt-repository --yes ppa:kubuntu-ppa/backports ; fi # cmake higher than 2.8.7 - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get update -qq ; fi - - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get install -y cmake valgrind default-jdk gfortran libboost-chrono1.48-dev libunwind-dev libelf-dev libdw-dev ; fi + - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get install -y cmake valgrind default-jdk gfortran libboost-chrono1.48-dev ; fi - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 ; fi - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 ; fi script: - - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . && make VERBOSE=1 && ctest --output-on-failure --timeout 100 - - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then ./tools/internal/travis-sonarqube.sh ; fi -# branches: -# only: -# - master + - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . + - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then ./tools/internal/travis-sonarqube.sh ; fi # run make in the sonar wrapper + - ctest --output-on-failure --timeout 100 notifications: recipients: - martin.quinson@ens-rennes.fr diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh index 3bdf700de6..4ec330ec8a 100755 --- a/tools/internal/travis-sonarqube.sh +++ b/tools/internal/travis-sonarqube.sh @@ -23,9 +23,7 @@ installBuildWrapper # triggers the compilation through the build wrapper to gather compilation database # We need to clean the build that was used for the tests before to ensure that everything gets rebuilt (sonarqube only use what's built throught its wrappers) # Plus, we need to activate MC so that it does not get throught the quality net :) -make clean -cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=ON -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF . -./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs make all +./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs make VERBOSE=1 # and finally execute the actual SonarQube analysis (the SONAR_TOKEN is set from the travis web interface, to not expose it) sonar-scanner -Dsonar.host.url=https://nemo.sonarqube.org -Dsonar.login=$SONAR_TOKEN -- 2.20.1