Minimal travis diff

.travis.yml

@@ -19,18 +19,24 @@ cache:
   - node_modules/
   - "$HOME/python/"
   - "$HOME/.nvm/"
+  - "$HOME/geckodriver_$GECKODRIVER_VERSION"
+  - travis_phantomjs
 env:
     global:
         - GECKODRIVER_VERSION=0.19.1
         - PHANTOMJS_VERSION=2.1.1
 before_install:
-- openssl aes-256-cbc -K $encrypted_a33f2fb5219d_key -iv $encrypted_a33f2fb5219d_iv -in website/deploy.pem.enc -out deploy.pem -d
-- chmod 600 deploy.pem
-- sudo dpkg --add-architecture i386
-- sudo apt-get -qq update
-- sudo apt-get install wine1.6
+  - openssl aes-256-cbc -K $encrypted_a33f2fb5219d_key -iv $encrypted_a33f2fb5219d_iv -in website/deploy.pem.enc -out deploy.pem -d
+  - chmod 600 deploy.pem
+  - sudo dpkg --add-architecture i386
+  - sudo apt-get -qq update
+  - sudo apt-get install wine1.6
 install:
-- phantomjs --version
+- "export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
+- "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
+- "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
+- "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
+- "phantomjs --version"
 - |
   if [[ ! -f ~/geckodriver_$GECKODRIVER_VERSION/geckodriver ]]; then
     rm -rf ~/geckodriver_$GECKODRIVER_VERSION;
@@ -39,25 +45,26 @@ install:
   fi
 - export PATH=$PATH:$HOME/geckodriver_$GECKODRIVER_VERSION
 - cpanm --notest GD::Image Text::Markdown DateTime JSON
+# only init the python virtualenv if it did not show up in our build cache
 - if [[ ! -f ~/python/bin/activate ]]; then virtualenv ~/python; fi
 - source ~/python/bin/activate
 - pip install nose selenium
 script:
-- if [[ "x$TRAVIS_TAG" != "x" ]]; then build/set_package_versions.pl $TRAVIS_TAG src/JBrowse/package.json
-  package.json; fi
+# these versions *should* already be set in version control, but set them again here just in case
+- if [[ "x$TRAVIS_TAG" != "x" ]]; then build/set_package_versions.pl $TRAVIS_TAG src/JBrowse/package.json package.json; fi
 - RELEASE_VERSION=`node -e 'require("fs").readFile("src/JBrowse/package.json", (e,d)=>console.log(JSON.parse(d).version))'`
 - BUILD_DIR=$PWD
 - set -e
-- "./setup.sh"
+- ./setup.sh
 - yarn lint
 - prove -Isrc/perl5 -r -j3 tests/perl_tests;
 - utils/jb_run.js -p 9000 & sleep 2
-- phantomjs tests/js_tests/run-jasmine.js http://localhost:9000/tests/js_tests/index.html
+- node_modules/.bin/phantomjs tests/js_tests/run-jasmine.js http://localhost:9000/tests/js_tests/index.html
 - utils/jb_run.js -p 8000 -s jbrowse & sleep 2
-- phantomjs tests/js_tests/run-jasmine.js http://localhost:8000/jbrowse/tests/js_tests/index.html
-- xvfb-run npm test-electron
-- MOZ_HEADLESS=1 SELENIUM_BROWSER=firefox JBROWSE_URL=http://localhost:9000/index.html
-  tests/selenium_tests/travis_wrapper.sh;
+- node_modules/.bin/phantomjs tests/js_tests/run-jasmine.js http://localhost:8000/jbrowse/tests/js_tests/index.html
+- xvfb-run node_modules/.bin/ava --timeout=60s tests/electron_tests
+- MOZ_HEADLESS=1 SELENIUM_BROWSER=firefox JBROWSE_URL=http://localhost:9000/index.html tests/selenium_tests/travis_wrapper.sh;
+# if we are building for inclusion into the `dev` branch, build the releases and test the minimal one too
 - |
   if [[ "x$TRAVIS_TAG" != "x" || $TRAVIS_BRANCH = "master" || $TRAVIS_BRANCH = "dev" || $TRAVIS_PULL_REQUEST != "false" ]]; then
     make -f build/Makefile;
@@ -74,6 +81,7 @@ script:
 after_failure:
 - cat setup.log
 deploy:
+# upload both minified and non-minified builds to GitHub releases
 - provider: releases
   api_key:
     secure: BuOD7rqrcGKT3g0hVY5AGpJI/Kkko4DhSIYSUQ28sS2AOdoNyTD0t5doL/Kiq4BC41q198tbFFt1dnXGdo8YKpBSXO/uGUuuiGtMFHM++I84oLq20p49iyrenNZ4m/jy/Q4YtizIYLs83DVzVdQzhJ5hrTx6f+d1gc9EgaMeBF4=
@@ -84,11 +92,12 @@ deploy:
     repo: GMOD/jbrowse
     perl: 5.26
     tags: true
+# upload regular non-minified version to npm
 - provider: npm
   email: rbuels@gmail.com
   skip_cleanup: true
   api_key:
-    secure: OpxHZGvyCFeG2CUpw4dHTz3kFBHJXeET2c4XxwKMxtL2FVt4W/zDLUV0gLQDFfsLlj+zjF62qtbHU8MajMw3aFLlTIdMIit+2s6H4D8kuBh5Q7pO5/gAykWtiwkJ3BudoYDGoDlB5kkakG4MPvvY26490hbmySCSgpsjetM91zE=
+    secure: "OpxHZGvyCFeG2CUpw4dHTz3kFBHJXeET2c4XxwKMxtL2FVt4W/zDLUV0gLQDFfsLlj+zjF62qtbHU8MajMw3aFLlTIdMIit+2s6H4D8kuBh5Q7pO5/gAykWtiwkJ3BudoYDGoDlB5kkakG4MPvvY26490hbmySCSgpsjetM91zE="
   on:
     repo: GMOD/jbrowse
     perl: 5.26