Merge pull request #85 from lgeiger/travis

Simplify CI builds

Author: rgbkrk

.travis.yml

@@ -1,4 +1,4 @@
-language: c
+language: node_js
 sudo: false
 
 addons:
@@ -9,33 +9,31 @@ addons:
     - gcc-4.9
     - g++-4.9
 
-os:
-  - linux
-  - osx
-
+matrix:
+  include:
+    - node_js: "6"
+      env: DEPLOY="true"
+    - node_js: "6"
+      env: ELECTRON="1.1.3"
+    - node_js: "6"
+      env: ELECTRON="1.4.4" REBUILD="true"
+    - os: osx
+      node_js: "6"
+      env: DEPLOY="true"
 env:
-  matrix:
-    - NODE_VERSION="6" DEPLOY="true"
-    - NODE_VERSION="6" ELECTRON="1.1.3"
-    - NODE_VERSION="6" ELECTRON="1.4.4" REBUILD="true"
   global:
     - GH_REF: github.com/nteract/zmq-prebuilt.git
     - secure: AMY9chDNyNawxPhxAksCREhbQoOmphQKo2hDuYIPXBCUNF6Zik969QlB07TVjo+Bo0KVEbG4ANTdI0FkFIhg4MuJIWUkW30ZDyCSovUx8zyWB/7IN23A4Cx4p4ZnKjezTHUQpZ9InRIZzy9kOR+215IIBP6GfxbUY89eDA6ARElcv1rwDjZqSnLAxfie6v80vIbhWxNK4kQjiEyIez5eWBjRg4//dmb63TvJjc78GFTaqmh6lRIApAyA0uKka14XR/PJw5IpDR+0Q2omHl4t4zbu9MdVNYMSD+c6iNxOq3fqZJwnyJ1ELErbtR8oeKgZX1SOew5QTCUZWQsa+ySYTCzUnhWjhCgN6W0ciVtT2PslS/ZcvnrGGIxJAOmTZwINw8sAp8yYdY9QCJOGdB5ah2oUBLGKElcFGqSblohXUEM1tXeRchmpXiiAxnPNtxc6lkZzz6NxDl2OFXSmjMS4Cr8cA//Bn6gM04xRJyETy86/8KDoL+ENc7gkeiuYUOFqkAn5X8PrqPdsPmF7yA61IF1ru/OgtiuCh+eqnzZKBPImJo2KfUIqVuRi/6eUaDfWLT7d/J84Vbe3p2nPxoFd2pSw60f/lIkzFSRZx3vBjQiW2MVUN7ZTdawMOzE4TpIV7rDOkKe7qJJobquJEjd2X9Z+8JiTYXK2pPN2GceiqAM=
 
 before_install:
   - export DISPLAY=':99.0'
   - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-  - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
-  - source ~/.nvm/nvm.sh
-  - nvm install $NODE_VERSION
-  - nvm use $NODE_VERSION
   - test "$(uname)" = "Darwin"  || export CXX=g++-4.9 CC=gcc-4.9
 
 install:
   - npm install
   - '[ -z "$ELECTRON" ] || npm install electron-prebuilt@${ELECTRON}'
-  - '[ -z "$REBUILD" ] || npm install -g node-gyp'
-  - '[ -z "$REBUILD" ] || node-gyp rebuild --runtime=electron --target=${ELECTRON} --disturl=https://atom.io/download/atom-shell --build-from-source'
+  - '[ -z "$REBUILD" ] || ./node_modules/node-gyp/bin/node-gyp.js rebuild --runtime=electron --target=${ELECTRON} --disturl=https://atom.io/download/atom-shell --build-from-source'
 
 script: if [[ -z "$ELECTRON" ]]; then travis_retry npm run coverage; else travis_retry npm run test:electron; fi
 

appveyor.yml

@@ -17,16 +17,15 @@ install:
   - ps: Install-Product node $env:nodejs_version $env:platform
   - npm install
   - IF DEFINED ELECTRON (npm install electron-prebuilt@%ELECTRON%)
-  - IF DEFINED ELECTRON (npm install -g node-gyp)
   # We always need to rebuild for electron even for electron <= 1.1.3
-  - IF DEFINED ELECTRON (node-gyp rebuild --runtime=electron --target=%ELECTRON% --disturl=https://atom.io/download/atom-shell --build-from-source)
+  - IF DEFINED ELECTRON (node_modules\.bin\node-gyp rebuild --runtime=electron --target=%ELECTRON% --disturl=https://atom.io/download/atom-shell --build-from-source)
 
 
 test_script:
   - IF DEFINED ELECTRON (appveyor-retry call npm run test:electron) ELSE (appveyor-retry call npm test)
 
 deploy_script:
-  - IF "%deploy%;%appveyor_repo_tag%"=="true;true" (npm install prebuild -g & prebuild --all -u %GITHUB_TOKEN%)
+  - IF "%deploy%;%appveyor_repo_tag%"=="true;true" (node_modules\.bin\prebuild --all -u %GITHUB_TOKEN%)
 
 notifications:
   - provider: Slack

scripts/publish_docs.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && $DEPLOY == "true" && $TRAVIS_OS_NAME == "linux" ]]
+if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_REPO_SLUG == 'zeromq/zeromq.js' && $TRAVIS_BRANCH == "master" && $DEPLOY == "true" && $TRAVIS_OS_NAME == "linux" ]]
 then
     npm run build:docs