Cosmetics.

[simgrid.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 05fcdbb..4368a85 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,24 +5,30 @@
 #   apt-get libns3-dev ns3
 #
 #
-#sudo: required
-dist: trusty
+dist: xenial
 language: cpp
 compiler:
    - gcc
 #  - clang 
+jdk:
+   - openjdk11
 addons:
   apt:
+    update: true
+    allow_unauthenticated: yes
     packages:
     - cmake
     - valgrind
-    - default-jdk
     - gfortran
     - libboost-dev
     - libboost-all-dev
     - libdw-dev
     - libevent-dev
     - libunwind8-dev
+#    - pybind11-dev # Not available in Xenial
+  homebrew:
+    packages:
+    - python
   coverity_scan:
     project:
       name: "simgrid/simgrid"
@@ -42,12 +48,11 @@ addons:
 #   - ls -lR $TRAVIS_BUILD_DIR/LuaInstall
 
 script:
-   - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then brew update; fi
-   - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then brew upgrade python; fi
    - 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 .; 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 [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then ./tools/internal/travis-sonarqube.sh make VERBOSE=1; else make VERBOSE=1 && ctest --output-on-failure --timeout 100; fi
+   # - if [[ -e Makefile ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then ./tools/internal/travis-sonarqube.sh make -j2 VERBOSE=1; else make -j2 VERBOSE=1 && ctest -j2 --output-on-failure ; fi
+   - make -j2 VERBOSE=1 all tests && ctest -j2 --output-on-failure
 notifications:
   recipients:
     - martin.quinson@ens-rennes.fr
@@ -55,6 +60,8 @@ notifications:
     on_success: change
     on_failure: always
   irc:
+    on_success: change
+    on_failure: always
     channels:
       - "irc.debian.org#simgrid"
   template: