diff options
| author | Mattes D <github@xoft.cz> | 2014-12-25 20:23:32 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-12-25 20:23:32 +0100 |
| commit | 8730643720a74b195aad8d0f67ba54637264800e (patch) | |
| tree | 66d45b8cc3425efb8d6758f91735e30d47d46abc | |
| parent | Fixed tools compilation. (diff) | |
| parent | Travis style check in the right folder. (diff) | |
| download | cuberite-8730643720a74b195aad8d0f67ba54637264800e.tar cuberite-8730643720a74b195aad8d0f67ba54637264800e.tar.gz cuberite-8730643720a74b195aad8d0f67ba54637264800e.tar.bz2 cuberite-8730643720a74b195aad8d0f67ba54637264800e.tar.lz cuberite-8730643720a74b195aad8d0f67ba54637264800e.tar.xz cuberite-8730643720a74b195aad8d0f67ba54637264800e.tar.zst cuberite-8730643720a74b195aad8d0f67ba54637264800e.zip | |
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | CIbuild.sh | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 26e74c1b2..84b963a89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,9 @@ before_install: install: # g++4.8 and clang - sudo apt-get install -qq g++-4.8 + + # lua, needed for style checking and possibly later on for bindings generation + - sudo apt-get install -qq lua5.1 # g++4.8 - if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; export CC="gcc-4.8"; fi diff --git a/CIbuild.sh b/CIbuild.sh index 5d95f88a6..755dc7daa 100755 --- a/CIbuild.sh +++ b/CIbuild.sh @@ -7,6 +7,9 @@ export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER export MCSERVER_BUILD_DATETIME=`date` cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1; +cd src +lua CheckBasicStyle.lua +cd .. make -j 2; make -j 2 test; cd MCServer/; |