commit 867228ee63ce457b4200c60d829e0ef7c7c0dd35
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Oct 17 16:54:55 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Oct 18 11:11:46 2016 -0700
tree 38dc732e86073965521a4e1a92ce89fabac3d043
parent 9d7f8fe0b6141d6998d34d793d019212531b3bde

build+ci: Synchronize build and CI scripts with ndn-cxx/NFD

This commit also fixes a minor problem causing compilation warnings.

Change-Id: I0c04d58fe9df24f181947b9fde1346283402fc7b

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4614546..db62c24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,27 @@
-# For Ubuntu platform only
-
-sudo: true
-language: cpp
-os:
-  - linux
-compiler:
-  - gcc
+sudo: required
+language: generic
+env:
+  global:
+    - JOB_NAME=limited-build
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      env:
+        - CXX=g++
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      env:
+        - CXX=clang++
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: osx
+      env:
+        - CXX=clang++
+        - NODE_LABELS="OSX OSX-10.9"
 notifications:
   email:
     on_success: always
     on_failure: always
-env:
-  - NODE_LABELS="Linux Ubuntu Ubuntu-12.04"
 script:
   - ./.jenkins