diff options
Diffstat (limited to 'util/travis')
| -rwxr-xr-x | util/travis/before_install.sh | 10 | ||||
| -rw-r--r-- | util/travis/clang-format-whitelist.txt | 15 | ||||
| -rwxr-xr-x | util/travis/clangtidy.sh | 4 | ||||
| -rw-r--r-- | util/travis/common.sh | 12 | ||||
| -rw-r--r-- | util/travis/lint.sh | 4 | ||||
| -rwxr-xr-x | util/travis/script.sh | 2 |
6 files changed, 23 insertions, 24 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index 19c40ef90..fe9243583 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -4,14 +4,14 @@ echo "Preparing for $TRAVIS_COMMIT_RANGE" . util/travis/common.sh -if [[ "${LINT}" == "1" ]]; then +if [[ ! -z "${CLANG_FORMAT}" ]]; then exit 0 fi needs_compile || exit 0 -if [[ $PLATFORM == "Unix" ]] || [[ $CLANG_TIDY == "1" ]]; then - if [[ $TRAVIS_OS_NAME == "linux" ]] || [[ $CLANG_TIDY == "1" ]]; then +if [[ $PLATFORM == "Unix" ]] || [[ ! -z "${CLANG_TIDY}" ]]; then + if [[ $TRAVIS_OS_NAME == "linux" ]] || [[ ! -z "${CLANG_TIDY}" ]]; then install_linux_deps else install_macosx_deps @@ -20,9 +20,7 @@ elif [[ $PLATFORM == "Win32" ]]; then sudo apt-get update sudo apt-get install p7zip-full wget http://minetest.kitsunemimi.pw/mingw-w64-i686_7.1.1_ubuntu14.04.7z -O mingw.7z - sed -e "s|%PREFIX%|i686-w64-mingw32|" \ - -e "s|%ROOTPATH%|/usr/i686-w64-mingw32|" \ - < util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw.cmake + # buildwin32.sh detects the installed toolchain automatically sudo 7z x -y -o/usr mingw.7z elif [[ $PLATFORM == "Win64" ]]; then sudo apt-get update diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt index e196daf73..0b36dcd57 100644 --- a/util/travis/clang-format-whitelist.txt +++ b/util/travis/clang-format-whitelist.txt @@ -155,6 +155,8 @@ src/genericobject.cpp src/genericobject.h src/gettext.cpp src/gettext.h +src/gui/guiButton.cpp +src/gui/guiButton.h src/gui/guiChatConsole.cpp src/gui/guiChatConsole.h src/gui/guiConfirmRegistration.cpp @@ -169,6 +171,9 @@ src/gui/guiMainMenu.h src/gui/guiPasswordChange.cpp src/gui/guiPathSelectMenu.cpp src/gui/guiPathSelectMenu.h +src/gui/guiScrollBar.cpp +src/gui/guiSkin.cpp +src/gui/guiSkin.h src/gui/guiTable.cpp src/gui/guiTable.h src/gui/guiVolumeChange.cpp @@ -213,14 +218,14 @@ src/mapgen/cavegen.cpp src/mapgen/cavegen.h src/mapgen/dungeongen.cpp src/mapgen/dungeongen.h +src/mapgen/mapgen.cpp +src/mapgen/mapgen.h src/mapgen/mapgen_carpathian.cpp src/mapgen/mapgen_carpathian.h -src/mapgen/mapgen.cpp src/mapgen/mapgen_flat.cpp src/mapgen/mapgen_flat.h src/mapgen/mapgen_fractal.cpp src/mapgen/mapgen_fractal.h -src/mapgen/mapgen.h src/mapgen/mapgen_singlenode.cpp src/mapgen/mapgen_singlenode.h src/mapgen/mapgen_v5.cpp @@ -291,9 +296,6 @@ src/porting_android.h src/porting.cpp src/porting.h src/profiler.h -src/quicktune.cpp -src/quicktune.h -src/quicktune_shortcutter.h src/raycast.cpp src/raycast.h src/reflowscan.cpp @@ -459,6 +461,9 @@ src/util/numeric.h src/util/pointedthing.cpp src/util/pointedthing.h src/util/pointer.h +src/util/quicktune.h +src/util/quicktune_shortcutter.h +src/util/quicktune.cpp src/util/serialize.cpp src/util/serialize.h src/util/sha1.cpp diff --git a/util/travis/clangtidy.sh b/util/travis/clangtidy.sh index 7ed555693..5b00115c8 100755 --- a/util/travis/clangtidy.sh +++ b/util/travis/clangtidy.sh @@ -3,9 +3,7 @@ needs_compile || exit 0 -if hash clang-tidy-5.0 2>/dev/null; then - CLANG_TIDY=clang-tidy-5.0 -else +if [ -z "${CLANG_TIDY}" ]; then CLANG_TIDY=clang-tidy fi diff --git a/util/travis/common.sh b/util/travis/common.sh index 949540967..b4406866e 100644 --- a/util/travis/common.sh +++ b/util/travis/common.sh @@ -7,15 +7,15 @@ set_linux_compiler_env() { elif [[ "${COMPILER}" == "gcc-6" ]]; then export CC=gcc-6 export CXX=g++-6 - elif [[ "${COMPILER}" == "gcc-7" ]]; then - export CC=gcc-7 - export CXX=g++-7 + elif [[ "${COMPILER}" == "gcc-8" ]]; then + export CC=gcc-8 + export CXX=g++-8 elif [[ "${COMPILER}" == "clang-3.6" ]]; then export CC=clang-3.6 export CXX=clang++-3.6 - elif [[ "${COMPILER}" == "clang-5.0" ]]; then - export CC=clang-5.0 - export CXX=clang++-5.0 + elif [[ "${COMPILER}" == "clang-7" ]]; then + export CC=clang-7 + export CXX=clang++-7 fi } diff --git a/util/travis/lint.sh b/util/travis/lint.sh index 887e621f5..b3027c689 100644 --- a/util/travis/lint.sh +++ b/util/travis/lint.sh @@ -1,9 +1,7 @@ #! /bin/bash function perform_lint() { echo "Performing LINT..." - if hash clang-format-5.0 2>/dev/null; then - CLANG_FORMAT=clang-format-5.0 - else + if [ -z "${CLANG_FORMAT}" ]; then CLANG_FORMAT=clang-format fi echo "LINT: Using binary $CLANG_FORMAT" diff --git a/util/travis/script.sh b/util/travis/script.sh index 32e8d2e36..19aa2fdf7 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -4,7 +4,7 @@ needs_compile || exit 0 -if [[ "$LINT" == "1" ]]; then +if [[ ! -z "${CLANG_FORMAT}" ]]; then # Lint and exit CI perform_lint exit 0 |