From ee5268a07e1060db5f0dd152668d4f8ac64c05a7 Mon Sep 17 00:00:00 2001
From: asmsuechan <suenagaryoutaabc@gmail.com>
Date: Tue, 25 Apr 2017 12:10:22 -0700
Subject: [PATCH] Change to separation osx and linux

---
 .travis.yml | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fb575486..595ae554 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,23 @@
 language: node_js
-os:
-  - linux
-  - osx
-node_js:
-  - 'stable'
-  - 'lts/*'
-script:
-  - 'npm run lint'
-  - 'npm run test'
-  - 'if [[ ${TRAVIS_BRAHCN} = "master" && ${TRAVIS_NODE_VERSION} = "stable" ]]; then ./script/e2e-runner.sh; fi'
+matrix:
+  include:
+    - os: osx
+      install:
+        - 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-TRAVIS_BRANCH} = "master" ]]; then yarn; fi'
+      node_js:
+        - 'stable'
+        - 'lts/*'
+      script:
+        - 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-TRAVIS_BRANCH} = "master" && ${TRAVIS_NODE_VERSION} = "stable" ]]; then
+             npm run lint;
+             npm run test;
+             ./script/e2e-runner.sh;
+           fi'
+    - os: linux
+      node_js:
+        - 'stable'
+        - 'lts/*'
+      script:
+        - 'npm run lint'
+        - 'npm run test'
+        - 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-TRAVIS_BRANCH} = "master" && ${TRAVIS_NODE_VERSION} = "stable" ]]; then ./script/e2e-runner.sh; fi'