Commit c587114f authored by Chris Rebert's avatar Chris Rebert
Browse files

Merge pull request #9210 from twbs/browserstack-travis-pr-fix-take-2

apparently PRs against twbs/bootstrap have the same Travis slug
parents d490c35a 887125d9
Showing with 2 additions and 2 deletions
+2 -2
...@@ -132,8 +132,8 @@ module.exports = function(grunt) { ...@@ -132,8 +132,8 @@ module.exports = function(grunt) {
var testSubtasks = ['jshint', 'qunit']; var testSubtasks = ['jshint', 'qunit'];
// Only run BrowserStack tests under Travis // Only run BrowserStack tests under Travis
if (process.env.TRAVIS) { if (process.env.TRAVIS) {
// Only run BrowserStack tests if you are twbs or have your own BrowserStack key // Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key
if (process.env.TRAVIS_REPO_SLUG === 'twbs/bootstrap' || process.env.TWBS_HAVE_OWN_BROWSERSTACK_KEY) { if ((process.env.TRAVIS_REPO_SLUG === 'twbs/bootstrap' && process.env.TRAVIS_PULL_REQUEST === 'false') || process.env.TWBS_HAVE_OWN_BROWSERSTACK_KEY) {
testSubtasks.push('browserstack_runner'); testSubtasks.push('browserstack_runner');
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment