X-Git-Url: https://git.octo.it/?p=supertux.git;a=blobdiff_plain;f=.travis.yml;h=66dfc759d1b22f8cb1a86fba1ead8a7db689885a;hp=2dbfc771cedb240849f645917f2ef70d1fef2f37;hb=092556fd403b1464402c741f949c48f04f628ee8;hpb=51d6ee653929c0299a6568811fa1e5506e6b445b

diff --git a/.travis.yml b/.travis.yml
index 2dbfc771c..66dfc759d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,15 @@ compiler:
  - gcc
  - clang
 
+matrix:
+ fast_finish: true
+
 env:
- - CMAKE_VERSION=3.0.2 SDL2_VERSION=2.0.3 SDL2IMAGE_VERSION=2.0.0
+  global:
+   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+   #   via the "travis encrypt" command using the project repo's public key
+   - secure: "E3/UuL338/FVeKbWVBH8RWznD3ntT8BZxX9TDTCwoZFTPluI53Bk0G3MdDBFihFYLeTMfNxxrT2n+EnQtf9a6SrUIo1xFYWV3yKNHwFiS0LKn0IvhofPoRsg+Y190Hgq8djFSEU1Gk4pYATSfRYnAAbVxuL51CumGVBgBkplB0A="
+   - CMAKE_VERSION=3.1.3 SDL2_VERSION=2.0.3 SDL2IMAGE_VERSION=2.0.0
  
 before_install:
  - sudo apt-get update -qq
@@ -30,7 +37,7 @@ before_install:
  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
 
  # CMake
- - wget http://www.cmake.org/files/v3.0/cmake-$CMAKE_VERSION.tar.gz -O - | tar xz
+ - wget http://www.cmake.org/files/v3.1/cmake-$CMAKE_VERSION.tar.gz -O - | tar xz
  - (cd cmake-$CMAKE_VERSION && cmake . && make -j5 && sudo make install)
 
  # SDL dependencies
@@ -40,17 +47,29 @@ before_install:
  - (cd SDL2_image-$SDL2IMAGE_VERSION && ./configure --prefix=/usr && make -j5 && sudo make install)
 
 script:
+ # Clean from previous Travis build
+- git clean -f
  # First a debug build:
 - mkdir build-debug
 - cd build-debug
-- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
-- make VERBOSE=1 -j5
+- cmake .. -DCMAKE_BUILD_TYPE=Debug
+- make VERBOSE=1 -j $(nproc)
 # Then a release build:
 - cd ..
 - mkdir build-release
 - cd build-release
-- cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
-- make VERBOSE=1 -j5
+- cmake .. -DCMAKE_BUILD_TYPE=Release
+- make VERBOSE=1 -j $(nproc)
+
+addons:
+  coverity_scan:
+    project:
+      name: "SuperTuxTeam/supertux"
+      description: "Build submitted via Travis CI"
+    notification_email: supertux-commit@lists.lethargik.org
+    build_command_prepend: "cmake . && make clean"
+    build_command:   "make -j 4"
+    branch_pattern: master
 
 notifications:
   email: