summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-08-28 14:12:54 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-08-28 14:12:54 -0400
commitb05fa9732af1e9dd624ece7f6698411937f4a0f5 (patch)
tree4683979a5fd4417526e752a28e0bc39633c517af /.travis.yml
parent5262750a582d954157de5d1fdbc11901aa906c25 (diff)
downloadqtlocation-mapboxgl-b05fa9732af1e9dd624ece7f6698411937f4a0f5.tar.gz
back to nvm node installs on travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml12
1 files changed, 6 insertions, 6 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: