summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-09-23 14:27:48 -0400
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-09-30 15:36:44 -0700
commit9fdc36c1a1c91f1fb0db336c2b9b7c61ec94cb20 (patch)
tree7c9dbc6c9ecf0ff6d3b2153f01893f164a4775cf /.travis.yml
parentb46c102eb0ec3ca2ff0b422831cb98fa2bdebcba (diff)
downloadqtlocation-mapboxgl-9fdc36c1a1c91f1fb0db336c2b9b7c61ec94cb20.tar.gz
[node] add support for Node.js v4.1.x and update changelog
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 f9d22b51e6..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=iojs-v3
+ 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=iojs-v3
+ env: FLAVOR=node NODE_VERSION=4
- os: osx
osx_image: xcode7
compiler: clang