X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.travis.yml;h=a8f4960c36be6ed274fb2a3ed2888afbcddf63b6;hb=b9f40748d04747d81cf79812a900e380d8f45c72;hp=ec324abe71d50c49dcb1f1b0d40aba2fd2949105;hpb=0194dd3e2c867067939b1ec42f7c653154c9029d;p=supertux.git diff --git a/.travis.yml b/.travis.yml index ec324abe7..a8f4960c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ 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" @@ -36,8 +36,8 @@ 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