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:
authorXhmikosR <xhmikosr@gmail.com>2018-11-04 13:15:19 +0300
committerXhmikosR <xhmikosr@gmail.com>2018-11-04 16:40:09 +0300
commit497766a3a6ec281b3e286ee6b02f81bc5c251895 (patch)
treeaf8fbcdcb3dfe0a0238fd44f4ac893a1ece4c251 /.travis.yml
parentca47a21b707ff6f88aa119554374c48c9a5ef08f (diff)
Travis: stop using a separate stage for Browser tests.
This should be faster.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml14
1 files changed, 3 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 451a79d117..b248bf1ffa 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