Update travis build to new container infrastructure (w/o sudo)

This commit is contained in:
sfan5 2016-10-05 23:06:05 +02:00
parent 42b36ecdaa
commit 13b485a75f
3 changed files with 29 additions and 25 deletions

View File

@ -5,12 +5,25 @@ compiler:
env:
- CXX11=1
- CXX11=0
before_install: ./util/travis/before_install.sh
sudo: false
addons:
apt:
sources:
- llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test
packages:
- cmake
- libgd2-noxpm-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
script: ./util/travis/script.sh
notifications:
email: false
matrix:
fast_finish: true
exclude:
- env: CXX11=1
compiler: gcc

View File

@ -1,20 +0,0 @@
#!/bin/bash -e
if [ $CC = "clang" ]; then
export PATH="/usr/bin/:$PATH"
sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'
sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183
sudo apt-get update
sudo apt-get install llvm-3.1
sudo apt-get install clang
fi
sudo apt-get update
sudo apt-get install cmake libgd2-noxpm-dev libsqlite3-dev \
p7zip-full
# I love how nothing ever works correctly with precise
wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z

View File

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