More load balancing and renaming

.travis.yml

@@ -12,8 +12,8 @@ cache:
     - examples/terminal/node_modules
 env:
   matrix:
-    - GROUP=base
-    - GROUP=misc
+    - GROUP=tests
+    - GROUP=coverage_and_docs
     - GROUP=examples
   global:
   - GH_REF: github.com/jupyterlab/jupyterlab.git

scripts/travis_after_success.sh

@@ -3,7 +3,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && $GROUP == "misc" ]]
+if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && $GROUP == "coverage_and_docs" ]]
 then
     echo "-- pushing docs --"
 
@@ -18,5 +18,5 @@ then
     git push --force --quiet "https://${GHTOKEN}@${GH_REF}" master:gh-pages > /dev/null 2>&1
     ) && echo "-- pushed docs --"
 else
-    echo "-- will only push docs from master branch misc build --"
+    echo "-- will only push docs from master branch \"coverage_and_docs\" build --"
 fi

scripts/travis_script.sh

@@ -9,7 +9,7 @@ sh -e /etc/init.d/xvfb start || true
 
 export PATH="$HOME/miniconda/bin:$PATH"
 
-if [[ $GROUP == base ]]; then
+if [[ $GROUP == tests ]]; then
 
     # Test against a clean npm build
     npm run clean
@@ -21,13 +21,6 @@ if [[ $GROUP == base ]]; then
     nosetests
     popd
 
-fi
-
-
-if [[ $GROUP == misc ]]; then
-    # Run the coverage check.
-    npm run test:coverage
-
     # Make sure we have CSS that can be converted with postcss
     npm install -g postcss-cli
     postcss jupyterlab/build/*.css > /dev/null
@@ -40,6 +33,12 @@ if [[ $GROUP == misc ]]; then
     sleep 5
     kill $TASK_PID
     wait $TASK_PID
+fi
+
+
+if [[ $GROUP == coverage_and_docs ]]; then
+    # Run the coverage check.
+    npm run test:coverage
 
     # Build the docs
     npm run docs