commit c7c990080a0b2936cfd1b31fd6b7845affb7df61
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Oct 09 17:27:30 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Oct 10 23:40:34 2015 -0700
tree 7ce3d00f5c2cc53d718c90f0d3120458a971994d
parent a81266c8f4b7e4e08fbd15d34b836674e8c51b5e

build+ci: Update default build flags and CI scripts

This commit also fixes a few compilation errors.

Change-Id: I19bcbe360423dad2532b9caee4edcdc6356b0075

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index db6a8c6..7f40779 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# For Ubuntu only
+sudo: true
 language: cpp
 os:
   - linux
@@ -8,9 +8,8 @@
   email:
     on_success: always
     on_failure: always
-before_install:
-  - travis_retry sudo apt-get update
-install:
-  - travis_retry sudo apt-get install -qq libssl-dev libpcap-dev libboost1.48-all-dev libcrypto++-dev libsqlite3-dev liblog4cxx10-dev protobuf-compiler libprotobuf-dev pkg-config
 script:
+  - if [[ $TRAVIS_OS_NAME == linux ]]; then export NODE_LABELS="Linux Ubuntu Ubuntu-12.04"; fi
+  - if [[ $TRAVIS_OS_NAME == osx ]]; then export NODE_LABELS="OSX OSX-10.10"; fi
+  - echo $NODE_LABELS
   - ./.jenkins