Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3ef51a1

Browse files
committedOct 5, 2016
Update travis build to new container infrastructure (w/o sudo)
1 parent 42b36ec commit 3ef51a1

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed
 

Diff for: ‎.travis.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,23 @@ compiler:
55
env:
66
- CXX11=1
77
- CXX11=0
8-
before_install: ./util/travis/before_install.sh
8+
sudo: false
9+
addons:
10+
apt:
11+
sources:
12+
- llvm-toolchain-precise-3.8
13+
- ubuntu-toolchain-r-test
14+
packages:
15+
- cmake
16+
- libgd2-noxpm-dev
17+
- libsqlite3-dev
18+
- p7zip
19+
- g++-6
20+
- clang-3.8
21+
before_install:
22+
- # Nothing ever works correctly with precise, use a custom libleveldb build
23+
- wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
24+
- 7zr x -olibleveldb libleveldb-1.18-ubuntu12.04.7z
925
script: ./util/travis/script.sh
1026
notifications:
1127
email: false

Diff for: ‎util/travis/before_install.sh

-20
This file was deleted.

Diff for: ‎util/travis/script.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22

33
mkdir -p travisbuild
44
cd travisbuild
5-
cmake -DENABLE_LEVELDB=1 -DUSE_CXX11=$CXX11 ..
5+
cmake \
6+
-DENABLE_LEVELDB=1 -DUSE_CXX11=$CXX11 \
7+
-DLEVELDB_LIBRARY=../libleveldb/lib/libleveldb.so \
8+
-DLEVELDB_INCLUDE_DIR=../libleveldb/include \
9+
..
610
make -j2

0 commit comments

Comments
 (0)
Please sign in to comment.