diff options
| author | sfan5 <sfan5@live.de> | 2020-03-08 21:03:44 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2020-03-12 00:10:09 +0100 |
| commit | 245876cddb6989dcad78f13aff9cd0d1cefa150e (patch) | |
| tree | 77d45c1d14655987ed2b19976b022a0ae57770bd /util/travis/common.sh | |
| parent | 766d160ffb36528365c6a38ac93304781e5cecee (diff) | |
| download | minetest-245876cddb6989dcad78f13aff9cd0d1cefa150e.tar.gz minetest-245876cddb6989dcad78f13aff9cd0d1cefa150e.tar.bz2 minetest-245876cddb6989dcad78f13aff9cd0d1cefa150e.zip | |
Update travis build infrastructure
Ubuntu 14.04 -> 18.04
clang-format, clang-tidy 7 -> 8
clang 3.6 -> 3.9
clang 7 -> 9
Diffstat (limited to 'util/travis/common.sh')
| -rw-r--r-- | util/travis/common.sh | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/util/travis/common.sh b/util/travis/common.sh index b4406866e..092a46577 100644 --- a/util/travis/common.sh +++ b/util/travis/common.sh @@ -1,31 +1,28 @@ #!/bin/bash -e set_linux_compiler_env() { - if [[ "${COMPILER}" == "gcc-5.1" ]]; then - export CC=gcc-5.1 - export CXX=g++-5.1 - elif [[ "${COMPILER}" == "gcc-6" ]]; then + if [[ "${COMPILER}" == "gcc-6" ]]; then export CC=gcc-6 export CXX=g++-6 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-7" ]]; then - export CC=clang-7 - export CXX=clang++-7 + elif [[ "${COMPILER}" == "clang-3.9" ]]; then + export CC=clang-3.9 + export CXX=clang++-3.9 + elif [[ "${COMPILER}" == "clang-9" ]]; then + export CC=clang-9 + export CXX=clang++-9 fi } # Linux build only install_linux_deps() { sudo apt-get update - sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \ + sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng-dev \ libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \ libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \ - gettext libpq-dev libleveldb-dev + gettext libpq-dev libpqtypes-dev libleveldb-dev } # Mac OSX build only |