.travis.yml: do not require sudo
This commit is contained in:
parent
29466b128b
commit
97e56ff486
19
.travis.yml
19
.travis.yml
@ -1,15 +1,26 @@
|
||||
sudo: required
|
||||
dist: trusty
|
||||
language: c
|
||||
compiler:
|
||||
- gcc
|
||||
- clang
|
||||
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- gdb
|
||||
- liblua5.2-0
|
||||
- liblua5.2-dev
|
||||
- libsqlite3-0
|
||||
- libsqlite3-dev
|
||||
- pkg-config
|
||||
- sqlite3
|
||||
- libssl-dev
|
||||
- libarchive-dev
|
||||
env:
|
||||
- PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
|
||||
- PKG_CONFIG_PATH=/tmp/usr/lib/pkgconfig
|
||||
- LD_LIBRARY_PATH=/tmp/usr/lib
|
||||
|
||||
before_install:
|
||||
- ./admin/travis-install-deps.sh
|
||||
|
||||
script:
|
||||
- LDFLAGS="-L/usr/local/lib -Wl,-R/usr/local/lib" ./configure --enable-tests --enable-debug && make -j16 && make check
|
||||
- LDFLAGS="-L/tmp/usr/lib -Wl,-R/tmp/usr/lib" ./configure --enable-tests --enable-debug && make -j16 && make check
|
||||
|
@ -29,10 +29,6 @@
|
||||
|
||||
set -e -x
|
||||
|
||||
sudo apt-get update -qq
|
||||
sudo apt-get install -y gdb liblua5.2-0 liblua5.2-dev \
|
||||
libsqlite3-0 libsqlite3-dev pkg-config sqlite3 \
|
||||
libssl-dev libarchive-dev
|
||||
|
||||
install_from_github() {
|
||||
local project="${1}"; shift
|
||||
@ -48,6 +44,7 @@ install_from_github() {
|
||||
|
||||
cd "${distname}"
|
||||
./configure \
|
||||
--prefix=/tmp/usr \
|
||||
--disable-developer \
|
||||
--without-atf \
|
||||
--without-doxygen \
|
||||
@ -55,7 +52,7 @@ install_from_github() {
|
||||
LDFLAGS="-L/usr/local/lib -Wl,-R/usr/local/lib" \
|
||||
PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
|
||||
make -j16
|
||||
sudo make install
|
||||
make install
|
||||
cd -
|
||||
|
||||
rm -rf "${distname}" "${distname}.tar.gz"
|
||||
|
Loading…
Reference in New Issue
Block a user