Add a refresh button to the serverlist (#6957)

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

diff --git a/util/travis/common.sh b/util/travis/common.sh
index a5b2de7282a014982a601e63d7b358aa23fa59a1..9495409672d89455b37075218323f390f9754dc1 100644 (file)
--- a/util/travis/common.sh
+++ b/util/travis/common.sh
@@ -13,9 +13,9 @@ set_linux_compiler_env() {
        elif [[ "${COMPILER}" == "clang-3.6" ]]; then
                export CC=clang-3.6
                export CXX=clang++-3.6
-       elif [[ "${COMPILER}" == "clang-4.0" ]]; then
-               export CC=clang-4.0
-               export CXX=clang++-4.0
+       elif [[ "${COMPILER}" == "clang-5.0" ]]; then
+               export CC=clang-5.0
+               export CXX=clang++-5.0
        fi
 }
 
@@ -31,7 +31,12 @@ install_linux_deps() {
 # Mac OSX build only
 install_macosx_deps() {
        brew update
-       brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit
+       brew install freetype gettext hiredis irrlicht leveldb libogg libvorbis luajit
+       if brew ls | grep -q jpeg; then
+               brew upgrade jpeg
+       else
+               brew install jpeg
+       fi
        #brew upgrade postgresql
 }
 
@@ -39,6 +44,11 @@ install_macosx_deps() {
 TRIGGER_COMPILE_PATHS="src/.*\.(c|cpp|h)|CMakeLists.txt|cmake/Modules/|util/travis/|util/buildbot/"
 
 needs_compile() {
-       git diff --name-only $TRAVIS_COMMIT_RANGE | egrep -q "^($TRIGGER_COMPILE_PATHS)"
+       RANGE="$TRAVIS_COMMIT_RANGE"
+       if [[ "$(git diff --name-only $RANGE -- 2>/dev/null)" == "" ]]; then
+               RANGE="$TRAVIS_COMMIT^...$TRAVIS_COMMIT"
+               echo "Fixed range: $RANGE"
+       fi
+       git diff --name-only $RANGE -- | egrep -q "^($TRIGGER_COMPILE_PATHS)"
 }