From ed89191a6278f257a013e7d2ef362def42fbaae3 Mon Sep 17 00:00:00 2001 From: Forbes Lindesay Date: Thu, 5 Feb 2015 11:27:57 +0000 Subject: [PATCH] Add support for io.js Unfortunately version 1.6.2 of nan appears to be broken (https://github.com/rvagg/nan/pull/265) so we pin to 1.5.0 until 1.6.2 comes out --- .travis.yml | 9 +++++++-- package.json | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71001ba..4692fbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,11 @@ os: - linux - osx +env: + matrix: + - NODE_VERSION="0.10" + - NODE_VERSION="iojs" + # What we'll be using to compile compiler: - gcc @@ -30,8 +35,8 @@ install: - rm -rf ~/.nvm/ - git clone --depth 1 https://github.com/creationix/nvm.git ~/.nvm - source ~/.nvm/nvm.sh -- nvm install 0.10 -- nvm use 0.10 +- nvm install $NODE_VERSION +- nvm use $NODE_VERSION # put local node-pre-gyp on PATH - export PATH=./node_modules/.bin/:$PATH diff --git a/package.json b/package.json index cab7a28..0d6c3d1 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "main": "index.js", "gypfile": true, "dependencies": { - "nan": "^1.5.0", - "node-pre-gyp": "^0.6.1" + "nan": "<2.0.0 >1.6.2 || 1.5.0", + "node-pre-gyp": "^0.6.2" }, "devDependencies": {}, "bundledDependencies": [ @@ -30,4 +30,4 @@ }, "author": "ForbesLindesay", "license": "MIT" -} \ No newline at end of file +}