From 98fb33003c4e58a6b7d9d2a64c9ea615940d86d8 Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sun, 24 Aug 2014 19:18:24 +0100 Subject: [PATCH] Revert "CI/Travis: Change to gcc in an attempt to reduce the number of killed builds" This reverts commit 32673f63c57612fde9dfb3dcd0f67b2a459fa7ca. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3626a8473..97b8ec30f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: cpp compiler: - - gcc + - clang git: depth: 1 @@ -18,8 +18,6 @@ install: - mysql -uroot -e 'create database test_mysql;' - mkdir bin - cd bin - - export CC=gcc-4.8 - - export CXX=g++-4.8 - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=1 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Release script: @@ -31,4 +29,4 @@ script: - for file in sql/updates/world/*.sql; do mysql -uroot world < $file; done - mysql -uroot < sql/create/drop_mysql.sql - cd bin - - make -j 8 + - make -j 4