From e296c1374104ef949ca8f6307f13b09dd4c4b09c Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Sun, 17 Sep 2017 17:23:19 +1000
Subject: [PATCH] Move Travis to build stages and fix skip browser flag.
 (#23961)

---
 .travis.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8be9f03dde..9137d5c4c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,27 +8,24 @@ node_js:
   - "8"
 before_install:
   - if [[ `npm -v` != 5* ]]; then npm install -g npm@5; fi
-  - "export TRAVIS_COMMIT_MSG=\"`git log --format=%B --no-merges -n 1`\""
-  - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip browser\]'; export TWBS_DO_BROWSER=$?; true
 install:
   - bundle install --deployment --jobs=3 --retry=3
   - npm install
-script:
-  - npm test
-  - if [ "$TWBS_TEST" = browser -a "$SAUCE_ACCESS_KEY" ]; then npm run js-test-cloud; fi
 after_success:
   - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then npm run docs-upload-preview; fi
+stages:
+  - test
+  - name: browser
+    if: type = push
+jobs:
+  include:
+    - stage: browser
+      node_js: 8
+      script: if ! git log --format=%B --no-merges -n 1 | grep '\[skip browser\]'; then npm test && npm run js-test-cloud; fi
 cache:
   directories:
     - node_modules
     - vendor/bundle
-env:
-  - TWBS_TEST=core
-  - TWBS_TEST=browser
-matrix:
-  exclude:
-    - node_js: "4"
-      env: TWBS_TEST=browser
 notifications:
   slack: heybb:iz4wwosL0N0EdaX1gvgkU0NH
   webhooks: