From b28793e2a946fb969230ee9b1dc538fbb367d20d Mon Sep 17 00:00:00 2001 From: Max Teufel Date: Sun, 8 Mar 2015 09:02:29 +0100 Subject: [PATCH] .travis.yml: reindent to ensure consistency --- .travis.yml | 70 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9e54de46..708885d1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,53 +13,53 @@ language: cpp compiler: - - gcc - - clang + - gcc + - clang matrix: - fast_finish: true + fast_finish: true env: 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 + # 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 - - sudo apt-get install build-essential libogg-dev libvorbis-dev libphysfs-dev libglew-dev libopenal-dev libboost-all-dev + - sudo apt-get update -qq + - sudo apt-get install build-essential libogg-dev libvorbis-dev libphysfs-dev libglew-dev libopenal-dev libboost-all-dev - # 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 + # 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 - # CMake - - 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) + # CMake + - 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 - - 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) + # SDL dependencies + - 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: - # 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 -- make VERBOSE=1 -j $(nproc) + # 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 + - make VERBOSE=1 -j $(nproc) addons: coverity_scan: -- 2.11.0