aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikaela Suomalainen <mikaela.suomalainen@outlook.com>2014-09-20 01:05:14 +0300
committerShadowNinja <shadowninja@minetest.net>2014-09-20 13:13:11 -0400
commitd6e28c19b59e336f4581682baacb6afb66956f95 (patch)
treec40f2702dd13e3ad40ceff40f59ef8133f3cd32c
parente9d62950e3b479871fb770daf0a04f84a5cf633f (diff)
downloadminetest-d6e28c19b59e336f4581682baacb6afb66956f95.tar.gz
minetest-d6e28c19b59e336f4581682baacb6afb66956f95.tar.bz2
minetest-d6e28c19b59e336f4581682baacb6afb66956f95.zip
.travis.yml: fix possible issues
* use `pool.sks-keyservers.net` as keyserver as it's often more reliable than `keyserver.ubuntu.com` as you can see with Google. * put script to multiple lines * build out-of-source * use two CPUs * make seems to fail if $(nproc) is used unlike WeeChat. ZNC has same issue. * mark build as failed if one job fails immediately without waiting for all builds to finish. * this doesn't stop jobs that didn't finish before build was marked failed.
-rw-r--r--.travis.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 2cd867295..a1f5b48dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,14 @@ compiler:
- gcc
- clang
before_install:
- - if [ $CC = "clang" ]; then export PATH="/usr/bin/:$PATH"; sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'; sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 92DE8183; sudo apt-get update; sudo apt-get install llvm-3.1; sudo apt-get install clang; fi
+ - if [ $CC = "clang" ]; then export PATH="/usr/bin/:$PATH"; sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'; sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183; sudo apt-get update; sudo apt-get install llvm-3.1; sudo apt-get install clang; fi
- sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev
-script: cmake . && make
+script:
+ - mkdir -p travisbuild
+ - cd travisbuild
+ - cmake ..
+ - make -j2
notifications:
email: false
+matrix:
+ fast_finish: true