From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Tue, 15 Aug 2017 14:12:05 +0000 (+0200)
Subject: install nodejs 8 on travis
X-Git-Tag: 6.6-RC1~605
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=83c40b005c2ed08bd1d1b3459e6b5a4c7224d476;p=sonarqube.git

install nodejs 8 on travis
---

diff --git a/travis.sh b/travis.sh
index b0e49824b35..c1fb2fbf84b 100755
--- a/travis.sh
+++ b/travis.sh
@@ -39,6 +39,12 @@ function installMaven {
   export PATH=$M2_HOME/bin:$PATH
 }
 
+function installNode {
+  set +u
+  source ~/.nvm/nvm.sh && nvm install 8
+  set -u
+}
+
 #
 # Replaces the version defined in sources, usually x.y-SNAPSHOT,
 # by a version identifying the build.
@@ -115,6 +121,7 @@ BUILD)
 
   installJdk8
   installMaven
+  installNode
   fixBuildVersion
 
   # Minimal Maven settings
@@ -177,8 +184,7 @@ BUILD)
   ;;
 
 WEB_TESTS)
-  set +u
-  source ~/.nvm/nvm.sh && nvm install 6
+  installNode
   curl -o- -L https://yarnpkg.com/install.sh | bash
   export PATH=$HOME/.yarn/bin:$PATH
   cd server/sonar-web && yarn && yarn validate