From f03f307b5787fa9352e8b2f1733da7c77dfa1533 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Tue, 24 Nov 2015 15:45:08 -0500
Subject: [PATCH] Travis: use build matrix for dual os

---
 .travis.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ffc629d48a..434c6e7bd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 cache:
   directories:
-  - resources
   - node_modules
 
 before_install:
@@ -10,11 +9,15 @@ before_install:
 
 script:
   - npm install
-  - npm test
   - '[ "${TRAVIS_OS_NAME}" = "linux" ] && npm test || false'
   - '[ "${TRAVIS_OS_NAME}" = "linux" && "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false'
   - '[ "${TRAVIS_OS_NAME}" = "osx" && "${TRAVIS_PULL_REQUEST}" = "false" ] && ./ci/release || false'
 
-os:
-  - osx
-  - linux
+matrix:
+  include:
+    - os: linux
+      services:
+      - docker
+    - os: osx
+      language: generic
+