diff options
| author | Chris Rebert <[email protected]> | 2013-08-07 13:27:27 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-08-07 13:30:00 -0700 |
| commit | 887125d9f5cf3e2f2ad93385497b052da2ca4652 (patch) | |
| tree | d145406149817697c3e81d8eac989113747dd74e | |
| parent | d490c35af379341a51bf853a5b46852e527e4ca7 (diff) | |
| download | bootstrap-887125d9f5cf3e2f2ad93385497b052da2ca4652.tar.xz bootstrap-887125d9f5cf3e2f2ad93385497b052da2ca4652.zip | |
apparently PRs against twbs/bootstrap have the same Travis slug
| -rw-r--r-- | Gruntfile.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 7f87fd6e9..9fe91e7f8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -132,8 +132,8 @@ module.exports = function(grunt) { var testSubtasks = ['jshint', 'qunit']; // Only run BrowserStack tests under Travis if (process.env.TRAVIS) { - // Only run BrowserStack tests if you are twbs or have your own BrowserStack key - if (process.env.TRAVIS_REPO_SLUG === 'twbs/bootstrap' || process.env.TWBS_HAVE_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.TRAVIS_PULL_REQUEST === 'false') || process.env.TWBS_HAVE_OWN_BROWSERSTACK_KEY) { testSubtasks.push('browserstack_runner'); } } |