Merge pull request #403 from mapbox/test-key-versions

Test key versions

.travis.yml

@@ -14,14 +14,12 @@ branches:
 env:
   matrix:
    - NODE_VERSION="0.10.33"
-   - NODE_VERSION="0.11.13"
-   - NODE_VERSION="0.11.14"
+   - NODE_VERSION="0.12.0"
+   - NODE_VERSION="iojs-1.1.0"
    - NODE_WEBKIT="0.8.6" TARGET_ARCH="ia32"
    - NODE_WEBKIT="0.8.6" TARGET_ARCH="x64"
    - NODE_WEBKIT="0.10.5" TARGET_ARCH="ia32"
    - NODE_WEBKIT="0.10.5" TARGET_ARCH="x64"
-   - NODE_WEBKIT="0.11.5" TARGET_ARCH="ia32"
-   - NODE_WEBKIT="0.11.5" TARGET_ARCH="x64"
   global:
     - secure: PifMOSnn+mWR1RUptXse+fLvWiTrzg0R/mazO7RWhXHWBKv0uAJ/qV3dI0GIRBLtjG10Iy+tT5RNh1TIbBzB9Y67wMcGvylUPG1+3EOKoBMEPnOD9AgCEQw4SOXfGPx0cq2N6ueSKieCgu1yKN9Wq7XCbE+zTk/DiRNIdLirVoo=
     - secure: cc4esJY1vPXL31IeumAJoKWDDO2BTGFiltwfO1jbTbiV7QT911QUjTUasxXIVpOaHNCpxSTyevPwwTWfzt2EtF92Lli+qhQ2bbzMiDSBZstSrHdAe62Ai2M1oYYUwk/0cABB/2nO9uRyYwITCxpTSNzZBrYhn3C29WqBhPeVDmM=

appveyor.yml

@@ -4,49 +4,33 @@ environment:
   node_pre_gyp_secretAccessKey:
     secure: 1amwJJw9fu0j6dXnc5KsAQbSYf7Cjw/dapT6OZWABa6nc52grkKeLQ+DGaOfQz8i
   matrix:
-    # custom visual studio 2014 builds
-    - nodejs_version: 0.10.33
-      platform: x86
-      msvs_toolset: 14
-      BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
-    - nodejs_version: 0.11.14
-      platform: x86
-      msvs_toolset: 14
-      BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
-    - nodejs_version: 0.10.33
-      platform: x64
-      msvs_toolset: 14
-      BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
-    - nodejs_version: 0.11.14
-      platform: x64
-      msvs_toolset: 14
-      BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
-    - nodejs_version: 0.10.32
-      nw_version: 0.8.6
+    - nodejs_version: 0.10.36
       platform: x86
       msvs_toolset: 12
-    - nodejs_version: 0.10.32
-      nw_version: 0.8.6
+    - nodejs_version: 0.10.36
       platform: x64
       msvs_toolset: 12
-    - nodejs_version: 0.11.13
-      nw_version: 0.11.5
+    - nodejs_version: 0.12.0
       platform: x86
       msvs_toolset: 12
-    - nodejs_version: 0.11.13
-      nw_version: 0.11.5
+    - nodejs_version: 0.12.0
       platform: x64
       msvs_toolset: 12
-    - nodejs_version: 0.11.13
-      nw_version: 0.11.5
+    - nodejs_version: 1.1.0
       platform: x86
       msvs_toolset: 12
-      BUILD_ARGS: --target=0.11.14
-    - nodejs_version: 0.11.13
-      nw_version: 0.11.5
+    - nodejs_version: 1.1.0
       platform: x64
       msvs_toolset: 12
-      BUILD_ARGS: --target=0.11.14
+    # custom visual studio 2014 builds
+    - nodejs_version: 0.10.33
+      platform: x86
+      msvs_toolset: 14
+      BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
+    - nodejs_version: 0.10.33
+      platform: x64
+      msvs_toolset: 14
+      BUILD_ARGS: --dist-url=https://s3.amazonaws.com/mapbox/node-cpp11 --toolset=v140
 
 os: Visual Studio 2014 CTP4
 
@@ -60,7 +44,7 @@ install:
   - SET ARCHPATH=
   - if %platform% == x64 (SET ARCHPATH=x64/)
   # install node version per visual studio toolset
-  - if "%msvs_toolset%" == "12" powershell Install-Product node $env:nodejs_version $env:platform
+  - if "%msvs_toolset%" == "12" powershell Update-NodeJsInstallation $env:nodejs_version $env:platform
   - if "%msvs_toolset%" == "14" powershell Write-Output "fetching https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/${env:ARCHPATH}node.exe"
   - if "%msvs_toolset%" == "14" powershell Start-FileDownload "https://mapbox.s3.amazonaws.com/node-cpp11/v$env:nodejs_version/${env:ARCHPATH}node.exe"
   # only needed if not using 'os: Visual Studio 2014 CTP4'

package.json

@@ -47,7 +47,7 @@
         "aws-sdk": "~2.0.25"
     },
     "engines": {
-        "node": ">= 0.10.0 < 0.11.0 || >= 0.11.13 < 0.13.0"
+        "node": ">= 0.10.0 < 0.11.0 || >= 0.11.13 < 0.13.0 || >= 1.0.0 < 2.0.0"
     },
     "engineStrict": true,
     "scripts": {

scripts/build_against_node.sh

@@ -51,10 +51,19 @@ if [[ $(uname -s) == 'Linux' ]]; then
     # node v0.8 and above provide pre-built 32 bit and 64 bit binaries
     # so here we use the 32 bit ones to also test 32 bit builds
     NVER=`node -v`
+    # enable 32 bit node
+    export PATH=$(pwd)/node-${NVER}-${platform}-x86/bin:$PATH
+    if [[ ${NODE_VERSION:0:4} == 'iojs' ]]; then
+        wget http://iojs.org/dist/${NVER}/iojs-${NVER}-${platform}-x86.tar.gz
+        tar xf iojs-${NVER}-${platform}-x86.tar.gz
+        # enable 32 bit iojs
+        export PATH=$(pwd)/iojs-${NVER}-${platform}-x86/bin:$PATH
+    else
         wget http://nodejs.org/dist/${NVER}/node-${NVER}-${platform}-x86.tar.gz
         tar xf node-${NVER}-${platform}-x86.tar.gz
         # enable 32 bit node
         export PATH=$(pwd)/node-${NVER}-${platform}-x86/bin:$PATH
+    fi
     # install 32 bit compiler toolchain and X11
     # test source compile in 32 bit mode with internal libsqlite3
     CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source
@@ -62,8 +71,11 @@ if [[ $(uname -s) == 'Linux' ]]; then
     npm test
     publish
     make clean
+    # broken for some unknown reason against io.js
+    if [[ ${NODE_VERSION:0:4} != 'iojs' ]]; then
         # test source compile in 32 bit mode against external libsqlite3
         sudo apt-get -y install libsqlite3-dev:i386
         CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source --sqlite=/usr
         npm test
+    fi
 fi