Revise Travis scripts, and use only Node 8

deploy/deploy.sh

@@ -3,11 +3,6 @@
 
 set -e
 
-function build {
-  npm run docs
-  VERSIONED=false npm run webpack
-}
-
 # For revert branches, do nothing
 if [[ "$TRAVIS_BRANCH" == revert-* ]]; then
   echo -e "\e[36m\e[1mBuild triggered for reversion branch \"${TRAVIS_BRANCH}\" - doing nothing."
@@ -31,13 +26,16 @@ else
   SOURCE_TYPE="branch"
 fi
 
-# For Node != 6, do nothing
-if [ "$TRAVIS_NODE_VERSION" != "6" ]; then
+# For Node != 8, do nothing
+if [ "$TRAVIS_NODE_VERSION" != "8" ]; then
   echo -e "\e[36m\e[1mBuild triggered with Node v${TRAVIS_NODE_VERSION} - doing nothing."
   exit 0
 fi
 
-build
+# Run the build
+npm run docs
+VERSIONED=false npm run webpack
+
 
 # Initialise some useful variables
 REPO=`git config remote.origin.url`

deploy/test.sh

@@ -2,12 +2,6 @@
 
 set -e
 
-function tests {
-  npm run lint
-  npm run docs:test
-  exit 0
-}
-
 # For revert branches, do nothing
 if [[ "$TRAVIS_BRANCH" == revert-* ]]; then
   echo -e "\e[36m\e[1mTest triggered for reversion branch \"${TRAVIS_BRANCH}\" - doing nothing."
@@ -16,8 +10,7 @@ fi
 
 # For PRs
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-  echo -e "\e[36m\e[1mTest triggered for PR #${TRAVIS_PULL_REQUEST} to branch \"${TRAVIS_BRANCH}\" - only running tests."
-  tests
+  echo -e "\e[36m\e[1mTest triggered for PR #${TRAVIS_PULL_REQUEST}."
 fi
 
 # Figure out the source of the test
@@ -27,8 +20,5 @@ else
   echo -e "\e[36m\e[1mTest triggered for branch \"${TRAVIS_BRANCH}\"."
 fi
 
-# For Node != 6
-if [ "$TRAVIS_NODE_VERSION" != "6" ]; then
-  echo -e "\e[36m\e[1mTest triggered with Node v${TRAVIS_NODE_VERSION} - only running tests."
-  tests
-fi
+# Run the tests
+npm test