BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Update travis build infrastructure

Browse Source 
Ubuntu 14.04 -> 18.04
clang-format, clang-tidy 7 -> 8
clang 3.6 -> 3.9
clang 7 -> 9
This commit is contained in:
sfan5 2020-03-08 21:03:44 +01:00
parent 766d160ffb
commit 245876cddb
2 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.travis.yml
View File

@ -1,8 +1,8 @@
language: cpp language: cpp
before_install: ./util/travis/before_install.sh before_install: ./util/travis/before_install.sh
script: ./util/travis/script.sh script: ./util/travis/script.sh
sudo: required os: linux
dist: trusty dist: bionic
group: edge group: edge
notifications: notifications:
email: false email: false
@ -10,21 +10,17 @@ matrix:
fast_finish: true fast_finish: true
include: include:
- env: CLANG_FORMAT=clang-format-7 - env: CLANG_FORMAT=clang-format-8
compiler: clang compiler: clang
os: linux os: linux
addons: addons:
apt: apt:
packages: ['clang-format-7'] packages: ['clang-format-8']
sources: &sources
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7
- name: "Builtin Luacheck and Unit Tests" - name: "Builtin Luacheck and Unit Tests"
language: generic language: generic
compiler: null compiler: null
os: linux os: linux
sudo: false
addons: addons:
apt: apt:
packages: packages:
@ -36,22 +32,21 @@ matrix:
- $HOME/.luarocks/bin/luacheck builtin - $HOME/.luarocks/bin/luacheck builtin
- $HOME/.luarocks/bin/busted builtin - $HOME/.luarocks/bin/busted builtin
- env: CLANG_TIDY=clang-tidy-7 - env: CLANG_TIDY=clang-tidy-8
compiler: clang compiler: clang
os: linux os: linux
script: ./util/travis/clangtidy.sh script: ./util/travis/clangtidy.sh
addons: addons:
apt: apt:
packages: ['clang-7', 'clang++-7', 'clang-tools-7', 'clang-tidy-7'] packages: ['clang-tidy-8']
sources: &sources
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7
- env: PLATFORM=Win32 - name: "MinGW cross-compiler (32-bit)"
env: PLATFORM=Win32
compiler: gcc compiler: gcc
os: linux os: linux
- env: PLATFORM=Win64 - name: "MinGW cross-compiler (64-bit)"
env: PLATFORM=Win64
compiler: gcc compiler: gcc
os: linux os: linux
@ -66,8 +61,6 @@ matrix:
addons: addons:
apt: apt:
packages: ['gcc-6', 'g++-6'] packages: ['gcc-6', 'g++-6']
sources: &sources
- ubuntu-toolchain-r-test
- env: PLATFORM=Unix COMPILER=gcc-8 - env: PLATFORM=Unix COMPILER=gcc-8
compiler: gcc compiler: gcc
@ -75,44 +68,31 @@ matrix:
addons: addons:
apt: apt:
packages: ['gcc-8', 'g++-8'] packages: ['gcc-8', 'g++-8']
sources: &sources
- ubuntu-toolchain-r-test
- env: PLATFORM=Unix COMPILER=clang-3.6 - env: PLATFORM=Unix COMPILER=clang-3.9
compiler: clang compiler: clang
os: linux os: linux
addons: addons:
apt: apt:
packages: ['clang-3.6', 'clang++-3.6'] packages: ['clang-3.9']
sources: &sources
- llvm-toolchain-trusty-3.6
- env: PLATFORM=Unix COMPILER=clang-7 - env: PLATFORM=Unix COMPILER=clang-9
compiler: clang compiler: clang
os: linux os: linux
addons: addons:
apt: apt:
packages: ['clang-7', 'clang++-7'] packages: ['clang-9']
sources: &sources
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7
- env: PLATFORM=Unix COMPILER=clang-7 FREETYPE=0 - env: PLATFORM=Unix COMPILER=clang-9 FREETYPE=0
compiler: clang compiler: clang
os: linux os: linux
addons: addons:
apt: apt:
packages: ['clang-7', 'clang++-7'] packages: ['clang-9']
sources: &sources
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7
- env: PLATFORM=Unix COMPILER=clang-7 VALGRIND=1 - env: PLATFORM=Unix COMPILER=clang-9 VALGRIND=1
compiler: clang compiler: clang
os: linux os: linux
addons: addons:
apt: apt:
packages: ['valgrind', 'clang-7', 'clang++-7'] packages: ['valgrind', 'clang-9']
sources: &sources
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-7

21
util/travis/common.sh
View File

@ -1,31 +1,28 @@
#!/bin/bash -e #!/bin/bash -e
set_linux_compiler_env() { set_linux_compiler_env() {
if [[ "${COMPILER}" == "gcc-5.1" ]]; then if [[ "${COMPILER}" == "gcc-6" ]]; then
export CC=gcc-5.1
export CXX=g++-5.1
elif [[ "${COMPILER}" == "gcc-6" ]]; then
export CC=gcc-6 export CC=gcc-6
export CXX=g++-6 export CXX=g++-6
elif [[ "${COMPILER}" == "gcc-8" ]]; then elif [[ "${COMPILER}" == "gcc-8" ]]; then
export CC=gcc-8 export CC=gcc-8
export CXX=g++-8 export CXX=g++-8
elif [[ "${COMPILER}" == "clang-3.6" ]]; then elif [[ "${COMPILER}" == "clang-3.9" ]]; then
export CC=clang-3.6 export CC=clang-3.9
export CXX=clang++-3.6 export CXX=clang++-3.9
elif [[ "${COMPILER}" == "clang-7" ]]; then elif [[ "${COMPILER}" == "clang-9" ]]; then
export CC=clang-7 export CC=clang-9
export CXX=clang++-7 export CXX=clang++-9
fi fi
} }
# Linux build only # Linux build only
install_linux_deps() { install_linux_deps() {
sudo apt-get update 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 \ libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-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 # Mac OSX build only