diff options
| -rw-r--r-- | util/travis/common.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/util/travis/common.sh b/util/travis/common.sh index a5b2de728..d040f639f 100644 --- a/util/travis/common.sh +++ b/util/travis/common.sh @@ -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)" } |