Commit 75b31155 authored by Chris Rebert's avatar Chris Rebert
Browse files

Merge pull request #15778 from twbs/node-012

Travis: test against node.js 0.12.
parents fd7c69b3 b9aad573
4 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!25326Adjust examples
Showing with 146 additions and 121 deletions
+146 -121
...@@ -2,7 +2,7 @@ language: node_js ...@@ -2,7 +2,7 @@ language: node_js
git: git:
depth: 10 depth: 10
node_js: node_js:
- "0.10" - "0.12"
before_install: before_install:
- travis_retry sudo pip install -r test-infra/requirements.txt - travis_retry sudo pip install -r test-infra/requirements.txt
- rvm use 1.9.3 --fuzzy - rvm use 1.9.3 --fuzzy
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
"grunt-sed": "~0.1.1", "grunt-sed": "~0.1.1",
"load-grunt-tasks": "~3.1.0", "load-grunt-tasks": "~3.1.0",
"markdown-it": "^3.0.5", "markdown-it": "^3.0.5",
"npm-shrinkwrap": "^200.0.0", "npm-shrinkwrap": "^200.1.0",
"time-grunt": "~1.0.0" "time-grunt": "~1.0.0"
}, },
"engines": { "engines": {
......
This diff is collapsed.
Supports Markdown
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