Add travis server only matrix configuration (#2682)

Also increase number of threads for the gcc builds
This commit is contained in:
Daniel Butum 2016-12-12 02:15:37 +02:00 committed by auriamg
parent ae0b1136f5
commit 244c812cf3

View File

@ -1,4 +1,4 @@
# Travis-CI configuration file for SuperTuxKart # Travis-CI configuration file for SuperTuxKart
# #
# Configuration manual: # Configuration manual:
# http://docs.travis-ci.com/user/build-configuration/ # http://docs.travis-ci.com/user/build-configuration/
@ -14,8 +14,10 @@ matrix:
env: env:
matrix: matrix:
- BUILD_TYPE="Debug" - BUILD_TYPE="Debug" SERVER_ONLY="OFF"
- BUILD_TYPE="Release" - BUILD_TYPE="Debug" SERVER_ONLY="ON"
- BUILD_TYPE="Release" SERVER_ONLY="OFF"
- BUILD_TYPE="Release" SERVER_ONLY="ON"
addons: addons:
apt: apt:
@ -39,8 +41,9 @@ addons:
before_script: before_script:
# Unfortunately using all threads crashes g++: "g++: internal compiler error: Killed (program cc1plus)" # Unfortunately using all threads crashes g++: "g++: internal compiler error: Killed (program cc1plus)"
# Use half of the available threads, gcc is memory hungry
- 'if [ ${CC} = "gcc" ]; then - 'if [ ${CC} = "gcc" ]; then
export THREADS=4; export THREADS=$((`nproc` / 2));
else else
export THREADS=$((`nproc` + 1)); export THREADS=$((`nproc` + 1));
fi' fi'
@ -50,7 +53,7 @@ before_script:
script: script:
- mkdir "build" - mkdir "build"
- cd "build" - cd "build"
- cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCHECK_ASSETS=off - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSERVER_ONLY=$SERVER_ONLY -DCHECK_ASSETS=off
- make VERBOSE=1 -j $THREADS - make VERBOSE=1 -j $THREADS
notifications: notifications: