diff options
| author | Bardi Harborow <[email protected]> | 2017-09-27 14:41:58 +0000 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2017-10-08 19:08:16 +0300 |
| commit | 258507b756075ded64bc13ac6deb92e5dcebb7e5 (patch) | |
| tree | 1c26672f37af445ab7cd5f01d71892853a75c64d | |
| parent | 5e7a9afe35c2685d88bdb4a94c6718ac758f79b0 (diff) | |
| download | bootstrap-258507b756075ded64bc13ac6deb92e5dcebb7e5.tar.xz bootstrap-258507b756075ded64bc13ac6deb92e5dcebb7e5.zip | |
Move from htmllint to Travis-only vnu.jar.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | build/.htmllintrc | 19 | ||||
| -rw-r--r-- | build/htmllint.js | 23 | ||||
| -rw-r--r-- | package.json | 2 |
4 files changed, 25 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index 57c810b0a..5952c303a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: install: - bundle install --deployment --jobs=3 --retry=3 - npm install + - curl -L https://github.com/validator/validator/releases/download/17.9.0/vnu.jar_17.9.0.zip | jar -x dist/vnu.jar && mv dist/vnu.jar vnu.jar after_success: - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then npm run docs-upload-preview; fi stages: diff --git a/build/.htmllintrc b/build/.htmllintrc deleted file mode 100644 index c04658fb9..000000000 --- a/build/.htmllintrc +++ /dev/null @@ -1,19 +0,0 @@ -{ - "attr-bans": ["align", "background", "bgcolor", "border", "frameborder", "longdesc", "marginwidth", "marginheight", "scrolling"], - "attr-name-style": false, - "attr-no-unsafe-char": false, - "class-style": "dash", - "doctype-first": true, - "doctype-html5": true, - "fig-req-figcaption": false, - "html-valid-content-model": false, - "id-class-ignore-regex": "(onclick|content|[a-z]+([A-Z][a-z])+)", - "id-class-style": "dash", - "img-req-src": false, - "img-req-alt": false, - "indent-style": "spaces", - "indent-width": 2, - "spec-char-escape": false, - "tag-bans": ["b", "i"], - "title-max-len": false -} diff --git a/build/htmllint.js b/build/htmllint.js new file mode 100644 index 000000000..a40ff922a --- /dev/null +++ b/build/htmllint.js @@ -0,0 +1,23 @@ +'use strict' + +const childProcess = require('child_process') +const fs = require('fs') + +if (fs.existsSync('vnu.jar')) { + childProcess.exec('java -version', function (error) { + if (error) { + console.error('skipping HTML lint test. java missing.') + return + } + + const vnu = childProcess.spawn( + 'java', + ['-jar', 'vnu.jar', '--skip-non-html', '_gh_pages/'], + { stdio: 'inherit' } + ) + + vnu.on('exit', process.exit) + }) +} else { + console.error('skipping HTML lint test. vnu.jar missing.') +} diff --git a/package.json b/package.json index 0b4958ff5..c7ed1ae5a 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "docs-compile": "bundle exec jekyll build", "postdocs-compile": "npm run docs-workbox-precache", "docs-github": "shx echo \"github: true\" > twbsconfig.yml && npm run docs-compile -- --config _config.yml,twbsconfig.yml && shx rm ./twbsconfig.yml", - "docs-lint": "htmllint --rc build/.htmllintrc \"_gh_pages/**/*.html\" \"js/tests/**/*.html\"", + "docs-lint": "node build/htmllint.js", "docs-serve": "bundle exec jekyll serve", "docs-upload-preview": "build/upload-preview.sh", "docs-workbox-precache": "node build/workbox.js", |