aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-08-06 19:54:15 -0700
committerChris Rebert <[email protected]>2013-08-06 20:14:36 -0700
commitfd3c4cab73e26af523ba87f49ac66b00ff27cbaa (patch)
tree5ff52cd7677d2da1a2ff391c1e787ff0fa7e6cd5
parent41bdd1a4823feb8b46b2fccfeec3e9c5057a0665 (diff)
downloadbootstrap-fd3c4cab73e26af523ba87f49ac66b00ff27cbaa.tar.xz
bootstrap-fd3c4cab73e26af523ba87f49ac66b00ff27cbaa.zip
disable BrowserStack for folks w/o their own key who are making PRs
-rw-r--r--.travis.yml1
-rw-r--r--Gruntfile.js6
2 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2abe85789..5ed6e43e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,4 @@ env:
global:
- secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w=
- secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew=
+ - TWBS_HAVE_OWN_BROWSERSTACK_KEY: ""
diff --git a/Gruntfile.js b/Gruntfile.js
index 71a87bdb0..7f87fd6e9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -130,8 +130,12 @@ module.exports = function(grunt) {
// Test task.
var testSubtasks = ['jshint', 'qunit'];
+ // Only run BrowserStack tests under Travis
if (process.env.TRAVIS) {
- testSubtasks.push('browserstack_runner');
+ // 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) {
+ testSubtasks.push('browserstack_runner');
+ }
}
grunt.registerTask('test', testSubtasks);