diff options
author | XhmikosR <xhmikosr@gmail.com> | 2019-03-13 18:07:03 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-13 18:07:03 +0300 |
commit | a29d5b6bd3d5fddef014973e988e7a16a78ee1f7 (patch) | |
tree | 60c50a9ee4ef0af2ecfe664e4dfccec727a20193 | |
parent | a53d11c0375442d108a8fb80152ade7064d36528 (diff) |
Tweak Travis scripts. (#437)
* add `travis_terminate 1` so that subsequent tests are skipped
* run `qunit` tests only on Node 10.
-rw-r--r-- | .travis.yml | 10 | ||||
-rw-r--r-- | package.json | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 5027141..c90d5ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,13 @@ node_js: install: - npm install before_script: - - git clone --depth 1 https://github.com/twbs/bootstrap.git --branch v3-dev - - bundle install --deployment --gemfile bootstrap/Gemfile --jobs=3 --retry=3 + - git clone --depth 1 https://github.com/twbs/bootstrap.git --branch v3-dev || travis_terminate 1 + - bundle install --deployment --gemfile bootstrap/Gemfile --jobs=3 --retry=3 || travis_terminate 1 - pushd bootstrap && bundle exec jekyll build && popd script: - - npm run travis - - node ./src/cli-main.js --disable W003,W005 "bootstrap/_gh_pages/**/index.html" - - node ./src/cli-main.js --disable W003,E001 test/fixtures/doctype/missing.html test/fixtures/viewport/missing.html + - npm run travis || travis_terminate 1 + - if [ "$TRAVIS_NODE_VERSION" = "10" ]; then npm run qunit; fi || travis_terminate 1 + - node ./src/cli-main.js --disable W003,W005 "bootstrap/_gh_pages/**/index.html" || travis_terminate 1 - node ./src/cli-main.js test/fixtures/x-ua-compatible/missing.html &> x-ua-compatible-missing.output.actual.txt || true - diff test/fixtures/cli/x-ua-compatible-missing.output.txt x-ua-compatible-missing.output.actual.txt after_success: diff --git a/package.json b/package.json index 8b98dad..74edb63 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "nodeunit": "nodeunit test", "qunit": "node build/phantom.js", "start": "node ./bin/www", - "test": "npm run eslint && npm run build && npm run nodeunit && npm run qunit", + "test": "npm run eslint && npm run build && npm run nodeunit", "travis": "nyc npm test" }, "dependencies": { |