merge before pushing, next time

diff --git a/.travis.yml b/.travis.yml
index b008468..c920898 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@
 #   apt-get libns3-dev ns3
 #
 #
-dist: xenial
+dist: bionic
 language: cpp
 compiler:
    - gcc
@@ -14,8 +14,6 @@ jdk:
    - openjdk11
 addons:
   apt:
-    update: true
-    allow_unauthenticated: yes
     packages:
     - cmake
     - valgrind
@@ -25,7 +23,7 @@ addons:
     - libdw-dev
     - libevent-dev
     - libunwind8-dev
-#    - pybind11-dev # Not available in Xenial
+    - pybind11-dev
   homebrew:
     packages:
     - python
@@ -38,19 +36,12 @@ addons:
     build_command:   "make VERBOSE=1"
     branch_pattern: coverity
 
-# Don't install lua from Debian as we need 5.3 and don't have a backport.
-#   Installing lua from the source does not make any dynamic library.
-#   - curl http://www.lua.org/ftp/lua-5.3.1.tar.gz | tar xz
-#   - cd lua-5.3.1 
-#   -   if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then make linux ; else make macosx ; fi
-#   -   make INSTALL_TOP=$TRAVIS_BUILD_DIR/LuaInstall install
-#   - cd ..
-#   - ls -lR $TRAVIS_BUILD_DIR/LuaInstall
-
 jobs:
   include:
     - os: linux
       script:
+      - sudo apt-get update -qq
+-     - sudo apt-get install cmake valgrind gfortran libboost-dev libboost-all-dev libdw-dev libevent-dev libunwind8-dev pybind11-dev
       - (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))
       - make -j2 VERBOSE=1 all tests && ctest -j2 --output-on-failure
     - os: windows
@@ -84,6 +75,3 @@ notifications:
       - "irc.debian.org#simgrid"
   template:
     - "%{repository}/%{branch} (%{commit} - %{author}): %{message}"
-cache:
-  directories:
-    - ~/mycache