Browse Source

Another load balance and rename

Steven Silvester 8 years ago
parent
commit
972c0184ed
3 changed files with 11 additions and 9 deletions
  1. 1 1
      .travis.yml
  2. 2 2
      scripts/travis_after_success.sh
  3. 8 6
      scripts/travis_script.sh

+ 1 - 1
.travis.yml

@@ -13,7 +13,7 @@ cache:
 env:
   matrix:
     - GROUP=base
-    - GROUP=coverage
+    - GROUP=misc
     - GROUP=examples
   global:
   - GH_REF: github.com/jupyterlab/jupyterlab.git

+ 2 - 2
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 == "base" ]]
+if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && $GROUP == "misc" ]]
 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 base build --"
+    echo "-- will only push docs from master branch misc build --"
 fi

+ 8 - 6
scripts/travis_script.sh

@@ -11,9 +11,9 @@ export PATH="$HOME/miniconda/bin:$PATH"
 
 if [[ $GROUP == base ]]; then
 
+    # Test against a clean npm build
     npm run clean
     npm run build:all
-
     npm test
 
     # Run the python tests
@@ -21,6 +21,13 @@ 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
@@ -49,11 +56,6 @@ if [[ $GROUP == base ]]; then
 fi
 
 
-if [[ $GROUP == coverage ]]; then
-    npm run test:coverage
-fi
-
-
 if [[ $GROUP == examples ]]; then
     # Make sure the examples build
     npm run build:examples