fixes

.travis.yml

@@ -7,9 +7,10 @@ os:
 
 env:
   matrix:
-   - export NODE_VERSION="0.8"
-   - export NODE_VERSION="0.10" NODE_WEBKIT="0.8.6"
-   - export NODE_VERSION="0.11"
+   - NODE_VERSION="0.8"
+   - NODE_VERSION="0.10"
+   - NODE_VERSION="0.11"
+   - NODE_WEBKIT="0.8.6"
   global:
     - secure: QhuP5E/kYL1j1KDkHGJtk6DSJr1RH4DR/JrC62Viuf5Du8jE+i0kPWfF2MxtuEmKo35orhpu8t8mzKygWfuO63WPuuIE9qd/+V/y99Lqcj0tEN6wJ5RnywktbTJWg23zphjhmYq3Xj8DLVEikCZBwHtlbygkO9Q60cn1PK+bnPg=
     - secure: HxCS2dQAWI0KmCFnFNNZoucG4FeAW+itG7+Hp0dNtwmxZzGOZYFO2bZcGvTAMNfVN++oqLxTebYQI1oB5yUl5mPJjrjthaGS6Zq3S6rfJcXiv+icYgEXlR6ejQ97dsHw1Jeg8nedCQlI4kHfvG6pgBLhq9hnugxH1Cjhdt14E9U=
@@ -17,23 +18,15 @@ env:
 before_install:
 # check if tag exists and matches package.json
 - scripts/validate_tag.sh
-# get commit message
-- COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
-# put node-pre-gyp on path
-- export PATH=./node_modules/.bin/:$PATH
-- git clone https://github.com/creationix/nvm.git ../.nvm
-- source ../.nvm/nvm.sh
-- nvm install $NODE_VERSION
-- nvm use $NODE_VERSION
-- node --version
-- npm --version
-- platform=$(uname -s | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/")
 
 install:
-- if [[ "${NODE_WEBKIT_VERSION}" != "" ]]; then ./scripts/build_against_node_webkit.sh; else ./build_against_node.sh; fi
+# put node-pre-gyp on path
+- export PATH=./node_modules/.bin/:$PATH
 
 before_script:
- - true
+# get commit message
+- export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
 
 script:
- - true
+- if [[ "${NODE_VERSION}" ]]; then ./scripts/build_against_node.sh; fi;
+- if [[ "${NODE_WEBKIT}" ]]; then ./scripts/build_against_node_webkit.sh; fi;

scripts/build_against_node.sh

@@ -2,6 +2,15 @@
 
 set -u -e
 
+if [[ ! -d ../.nvm ]]; then
+    git clone https://github.com/creationix/nvm.git ../.nvm
+fi
+source ../.nvm/nvm.sh
+nvm install $NODE_VERSION
+nvm use $NODE_VERSION
+node --version
+npm --version
+
 # test installing from source
 npm install --build-from-source
 node-pre-gyp package testpackage

scripts/build_against_node_webkit.sh

@@ -2,6 +2,15 @@
 
 set -u -e
 
+if [[ ! -d ../.nvm ]]; then
+    git clone https://github.com/creationix/nvm.git ../.nvm
+fi
+source ../.nvm/nvm.sh
+nvm install 0.10
+nvm use 0.10
+node --version
+npm --version
+
 # for testing node-webkit, launch a virtual display
 export DISPLAY=:99.0
 sh -e /etc/init.d/xvfb start +extension RANDR