{travis.yml,ci_build.sh}: use container-based build

80b7edc0 · Lucas Russo · 64006d5c · 80b7edc0 · 80b7edc0
Commit 80b7edc0 authored Sep 15, 2015 by Lucas Russo
Hide whitespace changes
Inline Side-by-side

Showing with 49 additions and 25 deletions

.travis.yml .travis.yml +7 -24

ci_build.sh ci_build.sh +42 -1

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,37 +5,20 @@ compiler:
 - clang
 - gcc

+sudo: false
+
 env:
 - BOARD=ml605 WITH_EXAMPLES=with_examples
 - BOARD=afcv3 WITH_EXAMPLES=with_examples

+addons:
+  apt:
+    packages:
+    - uuid-dev
+
 before_install:
 - git submodule update --init --recursive

-#   Build-check-install all subprojects
-before_script:
- sudo apt-get install uuid-dev
-
-#   libsodium
- git clone git://github.com/jedisct1/libsodium.git
- ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig )
-
-#   libzmq
- git clone git://github.com/zeromq/libzmq.git
- ( cd libzmq; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig )
-
-#   CZMQ
- git clone git://github.com/zeromq/czmq.git
- ( cd czmq; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig )
-
-#   Zyre
- git clone git://github.com/zeromq/zyre.git
- ( cd zyre; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig )
-
-#   Malamute
- git clone git://github.com/zeromq/malamute.git
- ( cd malamute; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig )
-
 #   Build and check this project
 script:
 - ./ci_build.sh
--- a/ci_build.sh
+++ b/ci_build.sh
 #!/usr/bin/env bash

-./compile.sh $BOARD $WITH_EXAMPLES
+# help debug
+set -x
+
+# Build and local install repositories
+mkdir tmp
+BUILD_PREFIX=$PWD/tmp
+
+CONFIG_FLAGS=()
+CONFIG_FLAGS+=("CFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_FLAGS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_FLAGS+=("CXXFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_FLAGS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
+CONFIG_OPTS=($CONFIG_FLAGS)
+CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
+CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
+
+#   libsodium
+git clone git://github.com/jedisct1/libsodium.git &&
+( cd libsodium; ./autogen.sh && ./configure --prefix=$BUILD_PREFIX &&
+    make check && make install ) || exit 1
+
+#   libzmq
+git clone git://github.com/zeromq/libzmq.git &&
+( cd libzmq; ./autogen.sh && ./configure  "${CONFIG_OPTS[@]}" &&
+    make check && make install ) || exit 1
+
+#   CZMQ
+git clone git://github.com/zeromq/czmq.git &&
+( cd czmq; ./autogen.sh && ./configure  "${CONFIG_OPTS[@]}" &&
+    make check && make install ) || exit 1
+
+#   Zyre
+git clone git://github.com/zeromq/zyre.git &&
+( cd zyre; ./autogen.sh && ./configure  "${CONFIG_OPTS[@]}" &&
+    make check && make install ) || exit 1
+
+#   Malamute
+git clone git://github.com/zeromq/malamute.git &&
+( cd malamute; ./autogen.sh && ./configure  "${CONFIG_OPTS[@]}" &&
+    make check && make install ) || exit 1
+
+./compile.sh $BOARD $WITH_EXAMPLES "${CONFIG_FLAGS[@]}"