Add a refresh button to the serverlist (#6957)

[dragonfireclient.git] / util / travis / script.sh

diff --git a/util/travis/script.sh b/util/travis/script.sh
index 84ea578a5aa0e6a8c43698354329660ed1add978..c68638db4acccdece550c11187b57d4707fb120b 100755 (executable)
--- a/util/travis/script.sh
+++ b/util/travis/script.sh
@@ -1,33 +1,41 @@
 #!/bin/bash -e
 . util/travis/common.sh
+. util/travis/lint.sh
 
 needs_compile || exit 0
 
-if [[ $PLATFORM == "Unix" ]]; then
+if [[ "$LINT" == "1" ]]; then
+       # Lint with exit CI
+       perform_lint
+       exit 0
+fi
+
+set_linux_compiler_env
+
+if [[ ${PLATFORM} == "Unix" ]]; then
        mkdir -p travisbuild
        cd travisbuild || exit 1
+
        CMAKE_FLAGS=''
-       if [[ $COMPILER == "g++-6" ]]; then
-               export CC=gcc-6
-               export CXX=g++-6
-       fi
-       # Clang builds with FreeType fail on Travis
-       if [[ $CC == "clang" ]]; then
-               CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE'
-       fi
-       if [[ $TRAVIS_OS_NAME == "osx" ]]; then
+
+       if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
                CMAKE_FLAGS+=' -DCUSTOM_GETTEXT_PATH=/usr/local/opt/gettext'
        fi
+
+       if [[ -n "${FREETYPE}" ]] && [[ "${FREETYPE}" == "0" ]]; then
+               CMAKE_FLAGS+=' -DENABLE_FREETYPE=0'
+       fi
+
        cmake -DCMAKE_BUILD_TYPE=Debug \
                -DRUN_IN_PLACE=TRUE \
                -DENABLE_GETTEXT=TRUE \
                -DBUILD_SERVER=TRUE \
-               $CMAKE_FLAGS ..
+               ${CMAKE_FLAGS} ..
        make -j2
 
        echo "Running unit tests."
        CMD="../bin/minetest --run-unittests"
-       if [[ "$VALGRIND" == "1" ]]; then
+       if [[ "${VALGRIND}" == "1" ]]; then
                valgrind --leak-check=full --leak-check-heuristics=all --undef-value-errors=no --error-exitcode=9 ${CMD} && exit 0
        else
                ${CMD} && exit 0