summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2015-03-10 23:48:39 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2015-03-10 23:48:39 +0100
commit12971c4ce2948cb212ca8bf492ccf2d2c6693734 (patch)
tree9aa3e5012842571f1192428cf494affa45528c2e
parentFixed client kick/crash if many block changes happend (diff)
downloadcuberite-12971c4ce2948cb212ca8bf492ccf2d2c6693734.tar
cuberite-12971c4ce2948cb212ca8bf492ccf2d2c6693734.tar.gz
cuberite-12971c4ce2948cb212ca8bf492ccf2d2c6693734.tar.bz2
cuberite-12971c4ce2948cb212ca8bf492ccf2d2c6693734.tar.lz
cuberite-12971c4ce2948cb212ca8bf492ccf2d2c6693734.tar.xz
cuberite-12971c4ce2948cb212ca8bf492ccf2d2c6693734.tar.zst
cuberite-12971c4ce2948cb212ca8bf492ccf2d2c6693734.zip
Diffstat (limited to '')
-rw-r--r--.travis.yml6
-rwxr-xr-xCIbuild.sh4
2 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 84b963a89..2fd3bf991 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
language: cpp
-compiler:
- - gcc
- - clang
+compiler: clang
before_install:
- if [ "$TRAVIS_MCSERVER_BUILD_TYPE" == "COVERAGE" ]; then sudo pip install cpp_coveralls; fi
@@ -29,8 +27,6 @@ after_success:
env:
- TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer
- TRAVIS_MCSERVER_BUILD_TYPE=DEBUG MCSERVER_PATH=./MCServer_debug
- - TRAVIS_MCSERVER_BUILD_TYPE=RELEASE TRAVIS_MCSERVER_FORCE32=1 MCSERVER_PATH=./MCServer
- - TRAVIS_MCSERVER_BUILD_TYPE=DEBUG TRAVIS_MCSERVER_FORCE32=1 MCSERVER_PATH=./MCServer_debug
matrix:
include:
diff --git a/CIbuild.sh b/CIbuild.sh
index 755dc7daa..490ff2e04 100755
--- a/CIbuild.sh
+++ b/CIbuild.sh
@@ -10,8 +10,8 @@ cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1;
cd src
lua CheckBasicStyle.lua
cd ..
-make -j 2;
-make -j 2 test;
+make -j 4;
+make -j 4 test;
cd MCServer/;
if [ "$TRAVIS_MCSERVER_BUILD_TYPE" != "COVERAGE" ]
then echo stop | $MCSERVER_PATH;