Commit e538c2e0 by Dane Springmeyer

re-enable entire matrix [skip ci]

parent 74a83a6a
...@@ -7,13 +7,13 @@ os: ...@@ -7,13 +7,13 @@ os:
env: env:
matrix: matrix:
#- NODE_VERSION="0.8" - NODE_VERSION="0.8"
#- NODE_VERSION="0.10" - NODE_VERSION="0.10"
#- NODE_VERSION="0.11" - NODE_VERSION="0.11"
- NODE_WEBKIT="0.8.6" TARGET_ARCH="ia32" - NODE_WEBKIT="0.8.6" TARGET_ARCH="ia32"
#- NODE_WEBKIT="0.8.6" TARGET_ARCH="x64" - NODE_WEBKIT="0.8.6" TARGET_ARCH="x64"
#- NODE_WEBKIT="0.10.1" TARGET_ARCH="ia32" - NODE_WEBKIT="0.10.1" TARGET_ARCH="ia32"
#- NODE_WEBKIT="0.10.1" TARGET_ARCH="x64" - NODE_WEBKIT="0.10.1" TARGET_ARCH="x64"
global: global:
- secure: QhuP5E/kYL1j1KDkHGJtk6DSJr1RH4DR/JrC62Viuf5Du8jE+i0kPWfF2MxtuEmKo35orhpu8t8mzKygWfuO63WPuuIE9qd/+V/y99Lqcj0tEN6wJ5RnywktbTJWg23zphjhmYq3Xj8DLVEikCZBwHtlbygkO9Q60cn1PK+bnPg= - secure: QhuP5E/kYL1j1KDkHGJtk6DSJr1RH4DR/JrC62Viuf5Du8jE+i0kPWfF2MxtuEmKo35orhpu8t8mzKygWfuO63WPuuIE9qd/+V/y99Lqcj0tEN6wJ5RnywktbTJWg23zphjhmYq3Xj8DLVEikCZBwHtlbygkO9Q60cn1PK+bnPg=
- secure: HxCS2dQAWI0KmCFnFNNZoucG4FeAW+itG7+Hp0dNtwmxZzGOZYFO2bZcGvTAMNfVN++oqLxTebYQI1oB5yUl5mPJjrjthaGS6Zq3S6rfJcXiv+icYgEXlR6ejQ97dsHw1Jeg8nedCQlI4kHfvG6pgBLhq9hnugxH1Cjhdt14E9U= - secure: HxCS2dQAWI0KmCFnFNNZoucG4FeAW+itG7+Hp0dNtwmxZzGOZYFO2bZcGvTAMNfVN++oqLxTebYQI1oB5yUl5mPJjrjthaGS6Zq3S6rfJcXiv+icYgEXlR6ejQ97dsHw1Jeg8nedCQlI4kHfvG6pgBLhq9hnugxH1Cjhdt14E9U=
......
...@@ -39,6 +39,7 @@ else ...@@ -39,6 +39,7 @@ else
# for testing node-webkit, launch a virtual display # for testing node-webkit, launch a virtual display
export DISPLAY=:99.0 export DISPLAY=:99.0
# NOTE: travis already has xvfb installed # NOTE: travis already has xvfb installed
# http://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-GUI-%28e.g.-a-Web-browser%29
sh -e /etc/init.d/xvfb start +extension RANDR sh -e /etc/init.d/xvfb start +extension RANDR
wget http://dl.node-webkit.org/v${NODE_WEBKIT}/${NW_DOWNLOAD}.tar.gz wget http://dl.node-webkit.org/v${NODE_WEBKIT}/${NW_DOWNLOAD}.tar.gz
tar xf ${NW_DOWNLOAD}.tar.gz tar xf ${NW_DOWNLOAD}.tar.gz
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment