From 497766a3a6ec281b3e286ee6b02f81bc5c251895 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 4 Nov 2018 12:15:19 +0200
Subject: [PATCH] Travis: stop using a separate stage for Browser tests.
This should be faster.
---
.travis.yml | 14 +++-----------
package.json | 1 -
2 files changed, 3 insertions(+), 12 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
diff --git a/package.json b/package.json
index ae21379abc..1013433c0b 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",
--
GitLab