summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-05-10 14:09:47 +0200
committerTycho <work.tycho+git@gmail.com>2014-05-10 14:09:47 +0200
commit604ed439a8a67f16f8af75a31630b2c5b3ece7f1 (patch)
tree9e4fc1171f0747c757d96b7649153c963ce47807
parentMerge branch 'master' into chunksparsing/structs (diff)
downloadcuberite-604ed439a8a67f16f8af75a31630b2c5b3ece7f1.tar
cuberite-604ed439a8a67f16f8af75a31630b2c5b3ece7f1.tar.gz
cuberite-604ed439a8a67f16f8af75a31630b2c5b3ece7f1.tar.bz2
cuberite-604ed439a8a67f16f8af75a31630b2c5b3ece7f1.tar.lz
cuberite-604ed439a8a67f16f8af75a31630b2c5b3ece7f1.tar.xz
cuberite-604ed439a8a67f16f8af75a31630b2c5b3ece7f1.tar.zst
cuberite-604ed439a8a67f16f8af75a31630b2c5b3ece7f1.zip
Diffstat (limited to '')
-rw-r--r--.travis.yml2
m---------MCServer/Plugins/Core0
-rw-r--r--uploadCoverage.sh5
3 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 3bf2acc43..1adc0c8ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ compiler:
- clang
before_install:
- - if [TRAVIS_MCSERVER_BUILD_TYPE == "COVERAGE"] then sudo pip install cpp_coveralls fi
+ - if [TRAVIS_MCSERVER_BUILD_TYPE == "COVERAGE"]; then sudo pip install cpp_coveralls; fi
# Build MCServer
script: CIbuild.sh
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject 5c8557d4fdfa580c100510cde07a1a778ea2e24
+Subproject 013a32a7fb3c8a6cfe0aef892d4c7394d4e1be5
diff --git a/uploadCoverage.sh b/uploadCoverage.sh
index 0897479ae..3a566d990 100644
--- a/uploadCoverage.sh
+++ b/uploadCoverage.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env bash
-if [TRAVIS_MCSERVER_BUILD_TYPE == "COVERAGE"] then
- coveralls --exclude lib --exclude tests
+if [TRAVIS_MCSERVER_BUILD_TYPE == "COVERAGE"]
+ then
+ coveralls --exclude lib --exclude tests
fi