From 278531370618a72d0a4c0a43c64ab3231b02e2cd Mon Sep 17 00:00:00 2001 From: furylynx Date: Sat, 21 Jul 2018 16:41:06 +0200 Subject: [PATCH] node tests: use provided version if present --- Tools/travis-linux-install.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh index 75e3ddbc4..7aeb12ada 100755 --- a/Tools/travis-linux-install.sh +++ b/Tools/travis-linux-install.sh @@ -37,10 +37,14 @@ case "$SWIGLANG" in "javascript") case "$ENGINE" in "node") - travis_retry wget -qO- https://raw.githubusercontent.com/xtuple/nvm/master/install.sh | sudo bash - travis_retry sudo nvm install ${VER} - sudo nvm use ${VER} - travis_retry npm install -g node-gyp + if [[ -z "$VER" ]]; then + travis_retry sudo apt-get install -qq nodejs node-gyp + else + travis_retry wget -qO- https://raw.githubusercontent.com/xtuple/nvm/master/install.sh | sudo bash + travis_retry sudo nvm install ${VER} + sudo nvm use ${VER} + travis_retry npm install -g node-gyp + fi ;; "jsc") travis_retry sudo apt-get install -qq libwebkitgtk-dev