From ea43ae231818e7999eb6c218a65198b3438a440c Mon Sep 17 00:00:00 2001
From: Cengiz Can <cengizIO@users.noreply.github.com>
Date: Sat, 23 May 2015 15:45:05 +0300
Subject: Fix #2105 - Add gcc to CI compilers

---
 .travis.yml | 24 ++++++------------------
 1 file 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
-- 
cgit v1.2.3