mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-09 15:16:51 +02:00
Merge pull request #9210 from twbs/browserstack-travis-pr-fix-take-2
apparently PRs against twbs/bootstrap have the same Travis slug
This commit is contained in:
@@ -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');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user