commit 3baef104edb5f1cb3fcbbe852de2a19f13a8d79f
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 01 14:21:47 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 01 14:21:47 2016 -0700
tree ce303892e1778ea2c9152b98a76bf08d6723bc88
parent 767f35ce27105c0663fecf96265e5c7025d3e52e

ci: Update Travis CI script to build using Ubuntu 14.04 and OS X 10.9

Change-Id: Ib0a40f55e6b9eca5866261a89d390ab5105b745a

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7f40779..127eddf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,24 @@
-sudo: true
-language: cpp
-os:
-  - linux
-compiler:
-  - gcc
+sudo: required
+language: generic
+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
 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