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

minetest · Oct 5, 2016 · 13b485a · 13b485a
1 parent 42b36ec
commit 13b485a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
diff --git a/util/travis/script.sh b/util/travis/script.sh
@@ -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