summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2018-08-02 07:10:55 +0100
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2018-08-02 07:10:55 +0100
commit4f7106cda20d22825c657068a389dcc46fddf89e (patch)
tree04cbabbe4f6ebf5ac1ea1d8d2a6ccf7a3718791c /Tools
parent8f224694e78cd17ecc3098be2f9f36378a54632e (diff)
parentbb73a1ce5254b92d7419f4131c9de5dc8fc608f0 (diff)
downloadswig-4f7106cda20d22825c657068a389dcc46fddf89e.tar.gz
Merge branch 'js-v8-52-tests'
* js-v8-52-tests: fixed nvm node tests: use provided version if present travis tests for different node versions fix travis tests Test NodeJS 4, 6, 8, and 10 Remove warnings on Node 6.x aka V8 5.0 and 5.1 Add Node 7.x aka V8 5.2+ support
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/travis-linux-install.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh
index 5e20558f5..caf53dbc1 100755
--- a/Tools/travis-linux-install.sh
+++ b/Tools/travis-linux-install.sh
@@ -41,7 +41,16 @@ case "$SWIGLANG" in
"javascript")
case "$ENGINE" in
"node")
- travis_retry sudo apt-get install -qq nodejs 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/creationix/nvm/v0.33.10/install.sh | bash
+ export NVM_DIR="$HOME/.nvm"
+ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+ travis_retry nvm install ${VER}
+ nvm use ${VER}
+ travis_retry npm install -g node-gyp
+ fi
;;
"jsc")
travis_retry sudo apt-get install -qq libwebkitgtk-dev