diff options
Diffstat (limited to 'util/travis')
| -rwxr-xr-x | util/travis/before_install.sh | 18 | ||||
| -rw-r--r-- | util/travis/common.sh | 8 | ||||
| -rwxr-xr-x | util/travis/script.sh | 7 |
3 files changed, 23 insertions, 10 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index 58dc42b17..891371984 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -1,29 +1,27 @@ #!/bin/bash -e +echo "Preparing for $TRAVIS_COMMIT_RANGE" +. util/travis/common.sh + +needs_compile || exit 0 if [[ $TRAVIS_OS_NAME == "linux" ]]; then - if [[ $CC == "clang" ]]; then - export PATH="/usr/bin/:$PATH" - sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list' - sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183 - sudo apt-get update - sudo apt-get install llvm-3.1 - sudo apt-get install clang - fi sudo apt-get update - sudo apt-get install p7zip-full + sudo apt-get install p7zip-full $COMPILER fi if [[ $PLATFORM == "Unix" ]]; then if [[ $TRAVIS_OS_NAME == "linux" ]]; then sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \ libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \ - libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext + libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \ + gettext libpq-dev postgresql-server-dev-all # Linking to LevelDB is broken, use a custom build wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z else brew update brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit + #brew upgrade postgresql fi elif [[ $PLATFORM == "Win32" ]]; then wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z diff --git a/util/travis/common.sh b/util/travis/common.sh new file mode 100644 index 000000000..16c7db324 --- /dev/null +++ b/util/travis/common.sh @@ -0,0 +1,8 @@ +#!/bin/bash -e + +# Relative to git-repository root: +TRIGGER_COMPILE_PATHS="src/|CMakeLists.txt|cmake/Modules/|util/travis/|util/buildbot/" + +needs_compile() { + git diff --name-only $TRAVIS_COMMIT_RANGE | egrep -q "^($TRIGGER_COMPILE_PATHS)" +} diff --git a/util/travis/script.sh b/util/travis/script.sh index 870954ebb..1bafb26cd 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -1,9 +1,16 @@ #!/bin/bash -e +. util/travis/common.sh + +needs_compile || exit 0 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' |