From c6269f6360581a84618dcbbc95cf0a2ee4cd8997 Mon Sep 17 00:00:00 2001
From: John Haley <johnh@axosoft.com>
Date: Thu, 20 Nov 2014 16:34:35 -0700
Subject: [PATCH 1/5] Added osx for testing on Travis

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e7aba778f..1723faca3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,9 @@ git:
 branches:
   only:
     - master
+os:
+  - linux
+  - osx
 script: npm --expose-gc test
 notifications:
   slack:

From c60d2c155bcca3f7ec8108b03a61b862cbeb8769 Mon Sep 17 00:00:00 2001
From: Tim Branyen <tim@tabdeveloper.com>
Date: Thu, 20 Nov 2014 18:44:29 -0500
Subject: [PATCH 2/5] Ensure NVM exists

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1723faca3..b72f78f06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 # Install GCC 4.8 for C++11 support.
 before_install:
+  - git clone https://github.com/creationix/nvm.git ./.nvm
+  - source ./.nvm/nvm.sh
+  - nvm install $NODE_VERSION
+  - nvm use $NODE_VERSION
   - "sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test"
   - "sudo apt-get -qq update"
   - "sudo apt-get -qq install g++-4.8"

From 12514fc18913e7449d0d722eb4b5e06bfc96aa1f Mon Sep 17 00:00:00 2001
From: Tim Branyen <tim@tabdeveloper.com>
Date: Thu, 20 Nov 2014 18:48:46 -0500
Subject: [PATCH 3/5] Remove Node language

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b72f78f06..59004910b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
-# Install GCC 4.8 for C++11 support.
+env:
+  matrix:
+    - export NODE_VERSION="0.10"
+    - export NODE_VERSION="0.11"
 before_install:
   - git clone https://github.com/creationix/nvm.git ./.nvm
   - source ./.nvm/nvm.sh
@@ -17,10 +20,6 @@ before_script:
  - chmod 600 ~/.ssh/id_rsa*
  - eval `ssh-agent -s`
  - ssh-add ~/.ssh/id_rsa
-language: node_js
-node_js:
-  - "0.10"
-  - 0.11
 git:
   depth: 1
 branches:

From c7204272136d91bacb287d115b554d0c52300f76 Mon Sep 17 00:00:00 2001
From: Tim Branyen <tim@tabdeveloper.com>
Date: Thu, 20 Nov 2014 18:59:01 -0500
Subject: [PATCH 4/5] Only apt-get in Linux

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 59004910b..6cfff19d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,14 @@ before_install:
   - source ./.nvm/nvm.sh
   - nvm install $NODE_VERSION
   - nvm use $NODE_VERSION
-  - "sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test"
-  - "sudo apt-get -qq update"
-  - "sudo apt-get -qq install g++-4.8"
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+      sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
+      sudo apt-get -qq update;
+      sudo apt-get -qq install g++-4.8;
+    fi
   - "export CXX='g++-4.8'"
   - "export JOBS=4"
+  - npm install
 # This is a random private key used purely for testing.
 before_script:
  - echo -e "Host *\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config

From d110bbad174f056e3e124d74c52ff27b1cc370c8 Mon Sep 17 00:00:00 2001
From: Tim Branyen <tim@tabdeveloper.com>
Date: Thu, 20 Nov 2014 19:18:49 -0500
Subject: [PATCH 5/5] Maybe not gcc 4.8?

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6cfff19d7..c7de3a62f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ before_install:
       sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
       sudo apt-get -qq update;
       sudo apt-get -qq install g++-4.8;
+      export CXX='g++-4.8';
     fi
-  - "export CXX='g++-4.8'"
   - "export JOBS=4"
   - npm install
 # This is a random private key used purely for testing.