diff options
| author | XhmikosR <[email protected]> | 2018-11-04 12:15:19 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2018-11-04 15:40:09 +0200 |
| commit | 497766a3a6ec281b3e286ee6b02f81bc5c251895 (patch) | |
| tree | af8fbcdcb3dfe0a0238fd44f4ac893a1ece4c251 | |
| parent | ca47a21b707ff6f88aa119554374c48c9a5ef08f (diff) | |
| download | bootstrap-497766a3a6ec281b3e286ee6b02f81bc5c251895.tar.xz bootstrap-497766a3a6ec281b3e286ee6b02f81bc5c251895.zip | |
Travis: stop using a separate stage for Browser tests.
This should be faster.
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | package.json | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 451a79d11..b248bf1ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,18 +10,10 @@ install: - npm install script: - npm test - - if [[ "$TRAVIS_NODE_VERSION" = "8" && "$TRAVIS_BUILD_STAGE_NAME" = "Test" ]]; then npm run check-broken-links; fi + - if [[ "$TRAVIS_NODE_VERSION" = "8" ]]; then npm run check-broken-links; fi + - if [[ "$TRAVIS_NODE_VERSION" = "8" && "$TRAVIS_EVENT_TYPE" = "push" && ! `git log --format=%B --no-merges -n 1 | grep '\[skip browser\]'` ]]; then npm run js-test-cloud; fi after_success: - - if [[ "$TRAVIS_NODE_VERSION" = "8" && "$TRAVIS_BUILD_STAGE_NAME" = "Test" ]]; then npm run coveralls; fi -stages: - - test - - name: browser - if: type = push -jobs: - include: - - stage: browser - node_js: 8 - script: if ! git log --format=%B --no-merges -n 1 | grep '\[skip browser\]'; then npm run js-test-cloud; fi + - if [[ "$TRAVIS_NODE_VERSION" = "8" ]]; then npm run coveralls; fi cache: directories: - node_modules diff --git a/package.json b/package.json index ae21379ab..1013433c0 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "js-test-karma-old": "cross-env USE_OLD_JQUERY=true npm run js-test-karma", "js-test-karma-bundle": "cross-env BUNDLE=true npm run js-test-karma", "js-test-karma-bundle-old": "cross-env BUNDLE=true USE_OLD_JQUERY=true npm run js-test-karma", - "prejs-test-cloud": "npm run js-compile && npm run js-test-karma", "js-test-cloud": "cross-env BROWSER=true npm run js-test-karma", "lint": "npm-run-all --parallel js-lint* css-lint*", "coveralls": "shx cat js/coverage/lcov.info | coveralls", |