From e39517c9f5b14d072fa98308df9aaf576ba1bb95 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 17 Aug 2015 01:26:35 +0100 Subject: [PATCH] Enable container-based build Remove use of "sudo", build and install in local directory in order to enable container-based CI builds --- .travis.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9ce5af8..24642dbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,23 @@ os: - linux - osx +sudo: false + +env: + global: + - BUILD_PREFIX=$PWD/tmp + - CFLAGS=-I${BUILD_PREFIX}/include + - CPPFLAGS=-I${BUILD_PREFIX}/include + - CXXFLAGS=-I${BUILD_PREFIX}/include + - LDFLAGS=-L${BUILD_PREFIX}/lib + - PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig + # Build required projects first before_script: - +- mkdir tmp # libsodium - git clone git://github.com/jedisct1/libsodium.git -- ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install; - if [ $TRAVIS_OS_NAME != "osx" ] ; then sudo ldconfig ; fi ) +- ( cd libsodium; ./autogen.sh; ./configure --prefix=${BUILD_PREFIX}; make check; make install ) # ZMQ stress tests need more open socket (files) than the usual default # On OSX, it seems the way to set the max files limit is constantly changing, so @@ -21,5 +31,5 @@ before_script: # Build and check this project script: -- ./autogen.sh && ./configure && make && make check -- sudo make install +- ./autogen.sh && ./configure --prefix=${BUILD_PREFIX} && make && make check +- make install