mirror of
https://github.com/minetest/minetestmapper.git
synced 2025-06-28 06:40:16 +02:00
Update travis build to new container infrastructure (w/o sudo)
This commit is contained in:
@ -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
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user