Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <code@chrisrebert.com>2015-09-26 01:32:42 +0300
committerChris Rebert <code@chrisrebert.com>2015-09-26 01:34:31 +0300
commit74cc05c0325bde26201aeff2ff7835f73158401b (patch)
tree924d3a24d9c5e9657a74739e55dede41a812c581
parent5a15971920c443d7e347c8edad79a6f2eafd9659 (diff)
Only run htmllint on Travis
So as to avoid any dependence on Java for normal users of the Gruntfile. [skip sauce]
-rw-r--r--Gruntfile.js4
-rw-r--r--package.json1
2 files changed, 4 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index dbcf935a82..deae1ca863 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,6 +18,7 @@ module.exports = function (grunt) {
var fs = require('fs');
var path = require('path');
var glob = require('glob');
+ var isTravis = require('is-travis');
var npmShrinkwrap = require('npm-shrinkwrap');
var mq4HoverShim = require('mq4-hover-shim');
@@ -436,7 +437,8 @@ module.exports = function (grunt) {
}
// Skip HTML validation if running a different subset of the test suite
if (runSubset('validate-html') &&
- // Skip HTML5 validator on Travis when [skip validator] is in the commit message
+ isTravis &&
+ // Skip HTML5 validator when [skip validator] is in the commit message
isUndefOrNonZero(process.env.TWBS_DO_VALIDATOR)) {
testSubtasks.push('validate-html');
}
diff --git a/package.json b/package.json
index 4ee5ab9114..fdd09f5a48 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
"grunt-scss-lint": "^0.3.8",
"grunt-sed": "~0.1.1",
"grunt-stamp": "^0.1.0",
+ "is-travis": "^1.0.0",
"load-grunt-tasks": "~3.3.0",
"markdown-it": "^4.4.0",
"mq4-hover-shim": "^0.2.0",