ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Another attempt at fixing travis ci"

Browse Source 
This reverts commit e85aced13b.
This commit is contained in:
vlj 2014-08-12 16:37:58 +02:00
parent a7a631a2c3
commit 36b791c515
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -14,27 +14,25 @@ before_install:
# Update repos # Update repos
- sudo apt-get update -qq - sudo apt-get update -qq
# Install dependencies # Install dependencies
- sudo apt-get install build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev - sudo apt-get install cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
# Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014, # Install mesa from an other repo (a newer version is required). Quantal is not supported anymore, saucy is only supported till July 2014,
# so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link) # so we try to use trusty (precise which is what traiv uses a too old mesa version which doesn't link)
- sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted" - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted"
- sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32 - sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev build-essential
- sudo apt-get -qq install g++-4.8
script: script:
# First a debug build: # First a debug build:
- mkdir build-debug - mkdir build-debug
- cd build-debug - cd build-debug
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off -CMAKE_CXX_COMPILER=/usr/bin/g++-4.8 -CMAKE_C_COMPILER=/usr/bin/gcc-4.8 - cmake .. -DCMAKE_BUILD_TYPE=Debug -DCHECK_ASSETS=off
- make VERBOSE=1 -j 4 - make VERBOSE=1 -j 4
# Then a release build: # Then a release build:
- cd .. - cd ..
- mkdir build-release - mkdir build-release
- cd build-release - cd build-release
- cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off -CMAKE_CXX_COMPILER=/usr/bin/g++-4.8 -CMAKE_C_COMPILER=/usr/bin/gcc-4.8 - cmake .. -DCMAKE_BUILD_TYPE=Release -DCHECK_ASSETS=off
- make VERBOSE=1 -j 4 - make VERBOSE=1 -j 4
notifications: notifications: