Fix #2105 - Add gcc to CI compilers
This commit is contained in:
parent
bd95d7bf7b
commit
ea43ae2318
24
.travis.yml
24
.travis.yml
@ -1,39 +1,27 @@
|
|||||||
language: cpp
|
language: cpp
|
||||||
compiler: clang
|
|
||||||
|
compiler:
|
||||||
|
- clang
|
||||||
|
- gcc
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
# - if [ "$TRAVIS_MCSERVER_BUILD_TYPE" == "COVERAGE" ]; then sudo pip install cpp_coveralls; fi
|
|
||||||
|
|
||||||
# g++4.8
|
|
||||||
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||||
- sudo apt-get update -qq
|
- sudo apt-get update -qq
|
||||||
|
|
||||||
install:
|
install:
|
||||||
# g++4.8 and clang
|
|
||||||
- sudo apt-get install -qq g++-4.8
|
- sudo apt-get install -qq g++-4.8
|
||||||
|
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
|
||||||
|
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90
|
||||||
|
|
||||||
# lua, needed for style checking and possibly later on for bindings generation
|
# lua, needed for style checking and possibly later on for bindings generation
|
||||||
- sudo apt-get install -qq lua5.1
|
- sudo apt-get install -qq lua5.1
|
||||||
|
|
||||||
# g++4.8
|
|
||||||
- if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; export CC="gcc-4.8"; fi
|
|
||||||
|
|
||||||
# Build MCServer
|
|
||||||
script: ./CIbuild.sh
|
script: ./CIbuild.sh
|
||||||
|
|
||||||
#after_success:
|
|
||||||
# - ./uploadCoverage.sh
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer
|
- TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer
|
||||||
- TRAVIS_MCSERVER_BUILD_TYPE=DEBUG MCSERVER_PATH=./MCServer_debug
|
- TRAVIS_MCSERVER_BUILD_TYPE=DEBUG MCSERVER_PATH=./MCServer_debug
|
||||||
|
|
||||||
#matrix:
|
|
||||||
# include:
|
|
||||||
# - compiler: gcc
|
|
||||||
# env: TRAVIS_MCSERVER_BUILD_TYPE=COVERAGE MCSERVER_PATH=./MCServer
|
|
||||||
|
|
||||||
# Notification Settings
|
|
||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
on_success: change
|
on_success: change
|
||||||
|
Loading…
Reference in New Issue
Block a user