Update travis build process

This commit is contained in:
sfan5 2018-03-25 13:52:51 +02:00
parent a8f7b47000
commit 405951f8f6
2 changed files with 8 additions and 13 deletions

@ -3,22 +3,19 @@ compiler:
- gcc - gcc
- clang - clang
sudo: false sudo: false
dist: trusty
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-precise-3.8 - llvm-toolchain-trusty-5.0
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- cmake - cmake
- libgd2-noxpm-dev - libgd2-dev
- libsqlite3-dev - libsqlite3-dev
- p7zip - libleveldb-dev
- g++-6 - g++-7
- clang-3.8 - clang-5.0
before_install:
- # Nothing ever works correctly with precise, use a custom libleveldb build
- wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
- 7zr x -olibleveldb libleveldb-1.18-ubuntu12.04.7z
script: ./util/travis/script.sh script: ./util/travis/script.sh
notifications: notifications:
email: false email: false

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
CXX=g++-6 CXX=g++-7
[ $CC == "clang" ] && CXX=clang++-3.8 [ $CC == "clang" ] && CXX=clang++-5.0
export CXX export CXX
@ -10,8 +10,6 @@ cd travisbuild
cmake \ cmake \
-DENABLE_LEVELDB=1 \ -DENABLE_LEVELDB=1 \
-DLEVELDB_LIBRARY=../libleveldb/lib/libleveldb.so \
-DLEVELDB_INCLUDE_DIR=../libleveldb/include \
.. ..
make -j2 make -j2