diff options
| author | Alexander Harkness <me@bearbin.net> | 2015-05-24 16:45:03 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2015-05-24 16:45:03 +0200 |
| commit | d50c8f073c979e855c3910bbb79b435f2f60f1a2 (patch) | |
| tree | 6190aace95714ac543246fb0430db432559a057a | |
| parent | Merge pull request #2091 from Rakete1111/master (diff) | |
| parent | Fix #2105 - Add gcc to CI compilers (diff) | |
| download | cuberite-d50c8f073c979e855c3910bbb79b435f2f60f1a2.tar cuberite-d50c8f073c979e855c3910bbb79b435f2f60f1a2.tar.gz cuberite-d50c8f073c979e855c3910bbb79b435f2f60f1a2.tar.bz2 cuberite-d50c8f073c979e855c3910bbb79b435f2f60f1a2.tar.lz cuberite-d50c8f073c979e855c3910bbb79b435f2f60f1a2.tar.xz cuberite-d50c8f073c979e855c3910bbb79b435f2f60f1a2.tar.zst cuberite-d50c8f073c979e855c3910bbb79b435f2f60f1a2.zip | |
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 6dde5b62b..e39cdbc14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,39 +1,27 @@ language: cpp -compiler: clang -before_install: -# - if [ "$TRAVIS_MCSERVER_BUILD_TYPE" == "COVERAGE" ]; then sudo pip install cpp_coveralls; fi +compiler: +- clang +- gcc - # g++4.8 +before_install: - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update -qq install: - # g++4.8 and clang - 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 - 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 -#after_success: -# - ./uploadCoverage.sh - env: - TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer - 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: email: on_success: change |