X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.travis.yml;h=1282f58513cf7f395ae29f6a22540db3afd2a488;hb=7be55d4d3cfdeea2c68405c4b2a1999b8e246331;hp=708885d1db487557cda4ed517181d9c0b99a9f4e;hpb=b28793e2a946fb969230ee9b1dc538fbb367d20d;p=supertux.git

diff --git a/.travis.yml b/.travis.yml
index 708885d1d..1282f5851 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,10 @@ env:
     # 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
+    - CMAKE_VERSION=3.2.1 SDL2_VERSION=2.0.3 SDL2IMAGE_VERSION=2.0.0
+  matrix:
+    - BUILD_TYPE="Debug"
+    - BUILD_TYPE="Release"
  
 before_install:
   - sudo apt-get update -qq
@@ -33,11 +36,11 @@ before_install:
   # Current gcc that supports C++ 11 features
   - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
   - sudo apt-get update -qq
-  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.9; fi
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
 
   # CMake
-  - wget http://www.cmake.org/files/v3.1/cmake-$CMAKE_VERSION.tar.gz -O - | tar xz
+  - wget http://www.cmake.org/files/v3.2/cmake-$CMAKE_VERSION.tar.gz -O - | tar xz
   - (cd cmake-$CMAKE_VERSION && cmake . && make -j5 && sudo make install)
 
   # SDL dependencies
@@ -49,16 +52,10 @@ before_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
-  - make VERBOSE=1 -j $(nproc)
-  # Then a release build:
-  - cd ..
-  - mkdir build-release
-  - cd build-release
-  - cmake .. -DCMAKE_BUILD_TYPE=Release
+  # Then build:
+  - mkdir "build-$BUILD_TYPE"
+  - cd "build-$BUILD_TYPE"
+  - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
   - make VERBOSE=1 -j $(nproc)
 
 addons: