summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-10-13 14:04:23 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-10-13 14:04:23 -0400
commit7171a1211403f0f446e0707f5599fb2ffb511521 (patch)
tree508608d66b13f554553804e7f846d977aceca4aa /.travis.yml
parentd1029d0fac12f678c9ecd68a603231ed036b4fbd (diff)
downloadqtlocation-mapboxgl-7171a1211403f0f446e0707f5599fb2ffb511521.tar.gz
Revert "[node] pin to Node.js v4.1 until #2597 is resolved"
This reverts commit d1029d0fac12f678c9ecd68a603231ed036b4fbd.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 415c2e33d2..d9e0cdb179 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ matrix:
apt:
packages: [ 'lib32stdc++6' ]
- os: linux
- env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=4.1
+ env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=4
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
@@ -79,7 +79,7 @@ matrix:
- os: osx
osx_image: xcode7
compiler: clang
- env: FLAVOR=node NODE_VERSION=4.1
+ env: FLAVOR=node NODE_VERSION=4
- os: osx
osx_image: xcode7
compiler: clang