Skip to content
Permalink
Browse files

Update travis build process

  • Loading branch information
sfan5 committed Mar 25, 2018
1 parent a8f7b47 commit 405951f8f6491ef4fc24536c96caff0f945d46a5
Showing with 8 additions and 13 deletions.
  1. +6 −9 .travis.yml
  2. +2 −4 util/travis/script.sh
@@ -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
@@ -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

0 comments on commit 405951f

Please sign in to comment.
You can’t perform that action at this time.