diff options
-rw-r--r-- | .travis.yml | 12 | ||||
-rwxr-xr-x | scripts/node/install.sh | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index db296ec158..299786029c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,19 +59,19 @@ matrix: apt: packages: [ 'lib32stdc++6' ] - os: linux - env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_EXE=iojs NODE_VERSION=2.0.1 + env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=iojs-v2 addons: apt: sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ] packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] - os: linux - env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_EXE=node NODE_VERSION=0.12.0 + env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=0.12 addons: apt: sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ] packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] - os: linux - env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_EXE=node NODE_VERSION=0.10.36 + env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=0.10 addons: apt: sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ] @@ -79,15 +79,15 @@ matrix: - os: osx osx_image: xcode6.4 compiler: clang - env: FLAVOR=node NODE_EXE=iojs NODE_VERSION=2.0.1 + env: FLAVOR=node NODE_VERSION=iojs-v2 - os: osx osx_image: xcode6.4 compiler: clang - env: FLAVOR=node NODE_EXE=node NODE_VERSION=0.12.0 + env: FLAVOR=node NODE_VERSION=0.12 - os: osx osx_image: xcode6.4 compiler: clang - env: FLAVOR=node NODE_EXE=node NODE_VERSION=0.10.36 + env: FLAVOR=node NODE_VERSION=0.10 env: global: diff --git a/scripts/node/install.sh b/scripts/node/install.sh index b0989ca0b1..8852f351e3 100755 --- a/scripts/node/install.sh +++ b/scripts/node/install.sh @@ -13,10 +13,11 @@ if [ ${TRAVIS_OS_NAME} == "linux" ]; then mason install mesa 10.4.3 fi -mapbox_time $NODE_EXE \ -mason install $NODE_EXE $NODE_VERSION +mapbox_time "install_nvm" \ +curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.26.1/install.sh | bash -export PATH="`mason prefix $NODE_EXE $NODE_VERSION`/bin":"$PATH" +mapbox_time $NODE_VERSION \ +nvm install $NODE_VERSION -$NODE_EXE --version +node --version npm --version |