X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.travis.yml;h=b1ecc4d7002135d0f444fa76a29f3b3157314ccd;hb=33b66711ec8c2f563a454f386a678eedd20a64a7;hp=40d9bcfcea3c9e28a25e89d837fb880c32301e41;hpb=45e9784f2f15f09084c7ba7dc86267111aa51100;p=supertux.git

diff --git a/.travis.yml b/.travis.yml
index 40d9bcfce..b1ecc4d70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,15 +10,17 @@
 # License: https://github.com/supertuxkart/stk-code/blob/master/COPYING
 #
 
-branches:
- only:
- - feature/travis
-
 language: cpp
 
 compiler:
  - gcc
  - clang
+
+matrix:
+ fast_finish: true
+
+env:
+ - CMAKE_VERSION=3.0.2 SDL2_VERSION=2.0.3 SDL2IMAGE_VERSION=2.0.0
  
 before_install:
  - sudo apt-get update -qq
@@ -31,37 +33,28 @@ 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-3.0.1.tar.gz -O - | tar xz
- - (cd cmake-3.0.1 && cmake . && make && sudo make install)
+ - wget http://www.cmake.org/files/v3.0/cmake-$CMAKE_VERSION.tar.gz -O - | tar xz
+ - (cd cmake-$CMAKE_VERSION && cmake . && make -j5 && sudo make install)
 
  # SDL dependencies
- - wget http://libsdl.org/release/SDL2-2.0.3.tar.gz -O - | tar xz
- - (cd SDL2-2.0.3 && ./configure --prefix=/usr && make -j5 && sudo make install)
- - wget http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.0.tar.gz -O - | tar xz
- - (cd SDL2_image-2.0.0 && ./configure --prefix=/usr && make -j5 && sudo make install)
+ - wget http://libsdl.org/release/SDL2-$SDL2_VERSION.tar.gz -O - | tar xz
+ - (cd SDL2-$SDL2_VERSION && ./configure --prefix=/usr && make -j5 && sudo make install)
+ - wget http://www.libsdl.org/projects/SDL_image/release/SDL2_image-$SDL2IMAGE_VERSION.tar.gz -O - | tar xz
+ - (cd SDL2_image-$SDL2IMAGE_VERSION && ./configure --prefix=/usr && make -j5 && sudo make install)
 
 script:
  # First a debug build:
 - mkdir build-debug
 - cd build-debug
-- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
-- make VERBOSE=1 -j 4
+- 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 -j 4 
+- cmake .. -DCMAKE_BUILD_TYPE=Release
+- make VERBOSE=1 -j $(nproc)
 
 notifications:
-irc:
-channels:
-- "irc.freenode.org#supertux"
-skip_join: false
-use_notice: true
-template:
-#- "[%{commit}: %{author}] %{message}"
-#- "%{build_url}"
-- "[%{repository}#%{branch} @%{commit}] %{author}): %{message}"
-- "Diff: %{compare_url}"
-- "Build: %{build_url}"
+  email:
+    - supertux-commit@lists.lethargik.org