From bd23d4989b308a2a03cd2b03bd6b18480c0cdd16 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Thu, 14 Dec 2017 12:29:55 -0800
Subject: [PATCH] Lock down nodejs version

The new Travis Trusty image uses node 8 (latest LTS) as the default.
Node 8 is incompatible with some modules used for the UI.
---
 .travis.yml       | 1 +
 scripts/travis.sh | 2 +-
 ui/.nvmrc         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 ui/.nvmrc

diff --git a/.travis.yml b/.travis.yml
index da9da6a13..4a40eb16a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@ before_install:
 install:
   - if [[ -z "$SKIP_NOMAD_TESTS" ]]; then make deps ; fi
   - if [[ "$RUN_STATIC_CHECKS" ]]; then make lint-deps ; fi
+  - if [[ "$RUN_UI_TESTS" ]]; then . $HOME/.nvm/nvm.sh && cd ui && nvm use && cd .. ; fi
 
 script:
   - sudo -E "PATH=$PATH" make travis
diff --git a/scripts/travis.sh b/scripts/travis.sh
index d17aa91e6..8e500f793 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -9,7 +9,7 @@ trap 'kill ${PING_LOOP_PID}' EXIT HUP INT QUIT TERM
 
 if [ "$RUN_STATIC_CHECKS" ]; then
     make check
-    if [ "$TRAVIS_OS_NAME" == "linux" ]; then 
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         make checkscripts
     fi
 fi
diff --git a/ui/.nvmrc b/ui/.nvmrc
new file mode 100644
index 000000000..1e8b31496
--- /dev/null
+++ b/ui/.nvmrc
@@ -0,0 +1 @@
+6