Merge pull request #159 from mapbox/new-versions

New versions
mapbox · Apr 29, 2015 · aa50df4 · aa50df4
2 parents 936c12d + 22858f8
commit aa50df4
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,24 @@
 language: cpp
 
-# http://docs.travis-ci.com/user/multi-os/
 os:
   - linux
   - osx
 
+sudo: false
+
+addons:
+  postgresql: "9.4"
+  apt:
+    # for testing node-webkit
+    packages: ['xvfb','libasound2','libx11-6','libglib2.0-0','libgtk2.0-0','libatk1.0-0','libgdk-pixbuf2.0-0','libcairo2','libfreetype6','libfontconfig1','libxcomposite1','libasound2','libxdamage1','libxext6','libxfixes3','libnss3','libnspr4','libgconf-2-4','libexpat1','libdbus-1-3','libudev0']
+
+
 env:
   matrix:
-   - NODE_VERSION="0.10.36"
-   - NODE_VERSION="0.12.0"
-   - NODE_VERSION="iojs-v1.2.0"
+   - NODE_VERSION="0.10.38"
+   - NODE_VERSION="0.12.2"
+   # https://github.com/mapbox/node-pre-gyp/issues/158
+   #- NODE_VERSION="iojs-v1.8.1"
   global:
    - secure: nxPEbegqL+ckZ03BvGJSOlfcNuoJvj+rkLbBmmOEuTrk79lvY0+gjpmvWu4gGXMt89Vz+iAJB29ERaUdriKzlmYmebhWEdwQ/aayUv2sNA0eduvr4TALW2iLfLqryeE4449xnuEvz469AVWxO8xoX9KgmrwTLnkMR9SbQHxB6jU=
    - secure: Fs0ilCVBL0DUMkd5vzLGL/5K364kLj1LpSKzwZpPvlU6Gx2jW+Zt59RfM1yOTCvrPWWNb+jc8jz8lbbPXAgUnYNmL54WkIjapr8yPIClw6AtNOSuPtL+zGVGT7FZEO7EntNuEtTer6Wj8IuWUT7myeAezKzNogYg7HyaO4JsoJc=

diff --git a/lib/util/abi_crosswalk.json b/lib/util/abi_crosswalk.json
@@ -335,6 +335,14 @@
     "node_abi": 14,
     "v8": "3.28"
   },
+  "0.12.1": {
+    "node_abi": 14,
+    "v8": "3.28"
+  },
+  "0.12.2": {
+    "node_abi": 14,
+    "v8": "3.28"
+  },
   "1.0.0": {
     "node_abi": 42,
     "v8": "3.31"
@@ -356,11 +364,63 @@
     "v8": "4.1"
   },
   "1.1.0": {
-    "node_abi": 43,
+    "node_abi": 42,
     "v8": "4.1"
   },
   "1.2.0": {
-    "node_abi": 43,
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.3.0": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.4.1": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.4.2": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.4.3": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.5.0": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.5.1": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.6.0": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.6.1": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.6.2": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.6.3": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.6.4": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.7.1": {
+    "node_abi": 42,
+    "v8": "4.1"
+  },
+  "1.8.1": {
+    "node_abi": 42,
     "v8": "4.1"
   }
 }
diff --git a/scripts/abi_crosswalk.js b/scripts/abi_crosswalk.js
@@ -127,7 +127,7 @@ if (update_node) {
   for (var i=0;i<=16;++i) {
     lines.push('0.11.'+i);
   }
-  for (var i=0;i<=0;++i) {
+  for (var i=0;i<=2;++i) {
     lines.push('0.12.'+i);
   }
   lines.forEach(function(ver) {

diff --git a/scripts/test-node-webkit.sh b/scripts/test-node-webkit.sh
@@ -23,12 +23,6 @@ else
     # assume 64 bit linux
     wget https://s3.amazonaws.com/node-webkit/v${NODE_WEBKIT_VERSION}/node-webkit-v${NODE_WEBKIT_VERSION}-linux-x64.tar.gz
     tar xf node-webkit-v${NODE_WEBKIT_VERSION}-linux-x64.tar.gz
-    sudo apt-get install -y xvfb libasound2 libx11-6 libglib2.0-0 libgtk2.0-0 libatk1.0-0 libgdk-pixbuf2.0-0 libcairo2 libfreetype6 libfontconfig1 libxcomposite1 libasound2 libxdamage1 libxext6 libxfixes3 libnss3 libnspr4 libgconf-2-4 libexpat1 libdbus-1-3 libudev0
-    # wget https://gist.githubusercontent.com/kez/2028715/raw/86f5084edb5cb0b9cdc1675ff310fad5e7579ee0/xvfb
-    # sudo mv xvfb /etc/init.d/xvfb
-    # sudo chmod 755 /etc/init.d/xvfb
-    # sudo update-rc.d xvfb defaults
-    # sudo /etc/init.d/xvfb start
     export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start;
     export PATH=${BASE}/node-webkit-v0.8.5-linux-x64:${PATH}
 fi