Browse Source

Break the travis build into three parts

Steven Silvester 8 years ago
parent
commit
d3acf1b255
3 changed files with 53 additions and 38 deletions
  1. 3 1
      .travis.yml
  2. 2 2
      scripts/travis_after_success.sh
  3. 48 35
      scripts/travis_script.sh

+ 3 - 1
.travis.yml

@@ -12,7 +12,9 @@ cache:
     - examples/terminal/node_modules
 env:
   matrix:
-  - GROUP=
+    - GROUP=unit
+    - GROUP=coverage
+    - GROUP=misc
   global:
   - GH_REF: github.com/jupyterlab/jupyterlab.git
   - secure: MWpTI6cj3/Bnmtrr0Oqlp2JeWqDneB9aEjlQDaRxLOkqVbxhqDcYW9qAgZZP+sq29vT5oVMWzyCirteKxJfG2vy3HQE1XNLhz82Sf/7sE6DQ51gohl0CcOeA/uA8hCXEw97hneFWsZgHKqSoch7nVDsE3qfYgO+930jHlnxYApJGP9hZFv2Q2NVa6+99kipEYS4BY/yBDYKy6/t4kXcnBrUlNaPtdjnXcrY9esLZ7EQtkaG5VqcQVIBaLJKGF5Q7Aufj5nCFaZ6hZDF1Bi/AbmIbVWFyiT+22i8DZK6YwenECckyzoWkl+bEhYepWsgBKh/BDgPBAmPWKHgU5V4apDaGqZBhF7FP6H02AdZYYuCwl47jyakqvWLZW7oDmorL+HsWG5HQ3m0tMT2ywdbwNOiD39tiPPXjsvROh5ys9vL6NzQvxILCeEOnzcZrFuxi2LGEZfnlqRIjkh1llUAvNc3mOycRLWDOwVQa2+U59qDRXCSY2RD+MOfcdFUGengVujTMaAPMBUa3E33/ZIOOKJtR5TIajYZvd9B2uDlz02QfvTK+hrTaNYJjRZ8WCaeSM/CIKdoLw+29MNO6eqtchw0/vNvM8c9EkhrhMQKcY04OecVhmZkemFhd4SD5l92VX3z3xSxLkmazfNkj3CigWDXNxfDd2ORoGjA46Pga8RM=

+ 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" ]]
+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 --"
+    echo "-- will only push docs from master branch misc build --"
 fi

+ 48 - 35
scripts/travis_script.sh

@@ -15,38 +15,51 @@ jupyter serverextension enable --py jupyterlab
 
 npm run clean
 npm run build
-npm test
-npm run test:coverage
-
-
-# Run the python tests
-npm run build:serverextension
-python setup.py build
-pushd jupyterlab
-nosetests
-popd
-npm run build:examples
-npm run docs
-cp jupyter-plugins-demo.gif docs
-
-# Make sure we have CSS that can be converted with postcss
-npm install -g postcss-cli
-postcss jupyterlab/build/*.css > /dev/null
-
-# Verify docs build
-pushd tutorial
-conda env create -n test_docs -f environment.yml
-source activate test_docs
-make linkcheck
-make html
-source deactivate
-popd
-
-# Make sure we can start and kill the lab server
-jupyter lab --no-browser &
-TASK_PID=$!
-# Make sure the task is running
-ps -p $TASK_PID || exit 1
-sleep 5
-kill $TASK_PID
-wait $TASK_PID
+
+if [[ $GROUP == unit ]]; then
+    npm run test:chrome
+
+    # Run the python tests
+    npm run build:serverextension
+    python setup.py build
+    pushd jupyterlab
+    nosetests
+    popd
+
+fi
+
+
+if [[ $GROUP == coverage ]]; then
+    npm run test:coverage
+fi
+
+
+if [[ $GROUP == misc ]]; then
+
+    npm run build:examples
+    npm run docs
+    cp jupyter-plugins-demo.gif docs
+
+    # Make sure we have CSS that can be converted with postcss
+    npm install -g postcss-cli
+    postcss jupyterlab/build/*.css > /dev/null
+
+    # Verify docs build
+    pushd tutorial
+    conda env create -n test_docs -f environment.yml
+    source activate test_docs
+    make linkcheck
+    make html
+    source deactivate
+    popd
+
+    # Make sure we can start and kill the lab server
+    jupyter lab --no-browser &
+    TASK_PID=$!
+    # Make sure the task is running
+    ps -p $TASK_PID || exit 1
+    sleep 5
+    kill $TASK_PID
+    wait $TASK_PID
+
+fi