From 405951f8f6491ef4fc24536c96caff0f945d46a5 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 25 Mar 2018 13:52:51 +0200 Subject: [PATCH] Update travis build process --- .travis.yml | 15 ++++++--------- util/travis/script.sh | 6 ++---- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35d1257..f595ff8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,22 +3,19 @@ compiler: - gcc - clang sudo: false +dist: trusty addons: apt: sources: - - llvm-toolchain-precise-3.8 + - llvm-toolchain-trusty-5.0 - ubuntu-toolchain-r-test packages: - cmake - - libgd2-noxpm-dev + - libgd2-dev - libsqlite3-dev - - p7zip - - g++-6 - - clang-3.8 -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 + - libleveldb-dev + - g++-7 + - clang-5.0 script: ./util/travis/script.sh notifications: email: false diff --git a/util/travis/script.sh b/util/travis/script.sh index 3c96f71..bf65b8a 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -1,7 +1,7 @@ #!/bin/bash -e -CXX=g++-6 -[ $CC == "clang" ] && CXX=clang++-3.8 +CXX=g++-7 +[ $CC == "clang" ] && CXX=clang++-5.0 export CXX @@ -10,8 +10,6 @@ cd travisbuild cmake \ -DENABLE_LEVELDB=1 \ - -DLEVELDB_LIBRARY=../libleveldb/lib/libleveldb.so \ - -DLEVELDB_INCLUDE_DIR=../libleveldb/include \ .. make -j2