Browse Source

Reorganize travis builds

Steven Silvester 7 years ago
parent
commit
b295b83513
3 changed files with 43 additions and 56 deletions
  1. 2 2
      .travis.yml
  2. 0 2
      scripts/travis_install.sh
  3. 41 52
      scripts/travis_script.sh

+ 2 - 2
.travis.yml

@@ -11,8 +11,8 @@ cache:
 env:
   matrix:
     - GROUP=tests
-    - GROUP=coverage_and_docs
-    - GROUP=cli
+    - GROUP=coverage
+    - GROUP=other
   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=

+ 0 - 2
scripts/travis_install.sh

@@ -32,6 +32,4 @@ pip install -v -e ".[test]"
 test -e jupyterlab/schemas/jupyter.extensions.shortcuts.json
 test -e jupyterlab/themes/jupyterlab-theme-light-extension/images/jupyterlab.svg
 npm install
-npm run build:main
 jupyter serverextension enable --py jupyterlab
-jupyter lab build

+ 41 - 52
scripts/travis_script.sh

@@ -10,66 +10,37 @@ sh -e /etc/init.d/xvfb start || true
 export PATH="$HOME/miniconda/bin:$PATH"
 
 
-npm run integrity
-npm run build:examples
-
-
 if [[ $GROUP == tests ]]; then
 
     # Run the JS and python tests
     py.test
-    npm run clean
-    npm run build:src
+    npm run build
     npm run build:test
     npm test
     npm run test:services || npm run test:services
 
-    # Make sure we have CSS that can be converted with postcss
-    npm install -g postcss-cli
-    postcss packages/**/style/*.css --dir /tmp
-
-    # Make sure we can make release assets
-    npm run build:static
-    if [ ! -f ./build/release_data.json ]; then
-        echo "npm publish in jupyterlab unsucessful!"
-    fi
-    python setup.py sdist
-    python setup.py bdist_wheel --universal
-
 fi
 
 
-if [[ $GROUP == coverage_and_docs ]]; then
+if [[ $GROUP == coverage ]]; then
+
     # Run the coverage and python tests.
     py.test
     npm run build
     npm run build:test
     npm run coverage
+    npm run clean
 
-    # Run the link check
-    pip install -q pytest-check-links
-    py.test --check-links -k .md .
-
-    # Build the api docs
-    npm run docs
-    cp jupyter_plugins.png docs
-
-    # Verify tutorial docs build
-    pushd docs
-    conda env create -n test_docs -f environment.yml
-    source activate test_docs
-    make html
-    source deactivate
-    popd
 fi
 
 
-if [[ $GROUP == cli ]]; then
+if [[ $GROUP == other ]]; then
+
     # Make sure we can successfully load the core app.
     pip install selenium
     python -m jupyterlab.selenium_check --core-mode
 
-    # Make sure we can build and run the app.
+    # Make sure we can run the built app.
     jupyter lab build
     python -m jupyterlab.selenium_check 
     jupyter labextension list
@@ -83,22 +54,6 @@ if [[ $GROUP == cli ]]; then
     python -m jupyterlab.selenium_check
     source deactivate
 
-    # Make sure we can install from the git checkout
-    conda create -n test_install2 notebook python=3.5
-    source activate test_install2
-    pushd ~
-    if [[ -z $TRAVIS_PULL_REQUEST_SLUG ]]; then
-        pip install git+git://github.com/$TRAVIS_REPO_SLUG.git@$TRAVIS_COMMIT;
-    else
-        pip install git+git://github.com/$TRAVIS_PULL_REQUEST_SLUG.git@$TRAVIS_PULL_REQUEST_BRANCH;  
-    fi
-
-    jupyter lab build
-    pip install selenium
-    python -m jupyterlab.selenium_check
-    source deactivate
-    popd
-
     # Test the cli apps.
     jupyter lab clean
     jupyter lab build
@@ -127,4 +82,38 @@ if [[ $GROUP == cli ]]; then
     jupyter labextension list -h
     jupyter labextension enable -h
     jupyter labextension disable -h
+
+    # Run the package integrity check
+    npm run integrity
+
+    # Make sure the examples build
+    npm run build:examples
+
+    # Run the link check
+    pip install -q pytest-check-links
+    py.test --check-links -k .md .
+
+    # Build the api docs
+    npm run docs
+    cp jupyter_plugins.png docs
+
+    # Verify tutorial docs build
+    pushd docs
+    conda env create -n test_docs -f environment.yml
+    source activate test_docs
+    make html
+    source deactivate
+    popd
+
+    # Make sure we have CSS that can be converted with postcss
+    npm install -g postcss-cli
+    postcss packages/**/style/*.css --dir /tmp
+
+    # Make sure we can make release assets
+    npm run build:static
+    if [ ! -f ./build/release_data.json ]; then
+        echo "npm publish in jupyterlab unsucessful!"
+    fi
+    python setup.py sdist
+    python setup.py bdist_wheel --universal
 fi