Travis: stop using a separate stage for Browser tests.

This should be faster.

diff --git a/.travis.yml b/.travis.yml
index 451a79d11764d608ccec36d617fdf2c41b75f125..b248bf1ffadc1405abf35b2aa68b39370e378aba 100644 (file)
--- 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 ae21379abc24bb3bc051a09b7912c94f799fc71f..1013433c0bdeabf66ce8a477070eee497e2d70a6 100644 (file)
--- 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",