diff options
author | Mattes D <github@xoft.cz> | 2015-09-06 10:05:18 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2015-09-06 10:05:18 +0200 |
commit | 7da79fdc19a9825b29cda58a698da1fa3cfb8e57 (patch) | |
tree | ec17a9703fe734956e4f151cb5306befc4fd7571 /CIbuild.sh | |
parent | Merge pull request #2459 from cuberite/fixes (diff) | |
parent | Renamed output directory to Server (diff) | |
download | cuberite-7da79fdc19a9825b29cda58a698da1fa3cfb8e57.tar cuberite-7da79fdc19a9825b29cda58a698da1fa3cfb8e57.tar.gz cuberite-7da79fdc19a9825b29cda58a698da1fa3cfb8e57.tar.bz2 cuberite-7da79fdc19a9825b29cda58a698da1fa3cfb8e57.tar.lz cuberite-7da79fdc19a9825b29cda58a698da1fa3cfb8e57.tar.xz cuberite-7da79fdc19a9825b29cda58a698da1fa3cfb8e57.tar.zst cuberite-7da79fdc19a9825b29cda58a698da1fa3cfb8e57.zip |
Diffstat (limited to '')
-rwxr-xr-x | CIbuild.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CIbuild.sh b/CIbuild.sh index f1a583c79..8a91549ad 100755 --- a/CIbuild.sh +++ b/CIbuild.sh @@ -2,9 +2,9 @@ set -e -export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE" -export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER -export MCSERVER_BUILD_DATETIME=`date` +export CUBERITE_BUILD_SERIES_NAME="Travis $CC $TRAVIS_CUBERITE_BUILD_TYPE" +export CUBERITE_BUILD_ID=$TRAVIS_JOB_NUMBER +export CUBERITE_BUILD_DATETIME=`date` if [ "$CXX" == "g++" ]; then # This is a temporary workaround to allow the identification of GCC-4.8 by CMake, required for C++11 features @@ -21,8 +21,8 @@ cd .. echo "Building..." make -j 2; make -j 2 test ARGS="-V"; -cd MCServer/; -if [ "$TRAVIS_MCSERVER_BUILD_TYPE" != "COVERAGE" ]; then - echo restart | $MCSERVER_PATH; - echo stop | $MCSERVER_PATH; +cd Server/; +if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then + echo restart | $CUBERITE_PATH; + echo stop | $CUBERITE_PATH; fi |