Skip to content

Commit

Permalink
add node v0.12 to travis
Browse files Browse the repository at this point in the history
  • Loading branch information
dduugg committed Feb 14, 2015
1 parent 3bdacf6 commit 6171898
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 20 deletions.
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
language: node_js
sudo: false
node_js:
- "0.10"
- "0.11"
matrix:
allow_failures:
- node_js: "0.11"
- "0.10"
- "0.12"
services:
- mongodb
before_script:
- sleep 10
- echo mongo mongo_travis
script:
- make travis
script: "make travis"
after_script: "npm install coveralls && cat ./coverage/lcov.info | coveralls"
18 changes: 7 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,18 @@ MONGO_CONNECTION?=mongodb://localhost/test_db
CUSTOMCONNSTR_mongo_settings_collection?=test_settings
CUSTOMCONNSTR_mongo_collection?=test_sgvs
MONGO_SETTINGS=MONGO_CONNECTION=${MONGO_CONNECTION} \
CUSTOMCONNSTR_mongo_collection=${CUSTOMCONNSTR_mongo_collection} \
CUSTOMCONNSTR_mongo_settings_collection=${CUSTOMCONNSTR_mongo_settings_collection}
CUSTOMCONNSTR_mongo_collection=${CUSTOMCONNSTR_mongo_collection} \
CUSTOMCONNSTR_mongo_settings_collection=${CUSTOMCONNSTR_mongo_settings_collection}

all: test

travis-cov:
NODE_ENV=test \
${MONGO_SETTINGS} \
istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -vvv -R tap ${TESTS} && \
cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && \
rm -rf ./coverage
travis:
NODE_ENV=test \
${MONGO_SETTINGS} \
istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -vvv -R tap ${TESTS}

test:
${MONGO_SETTINGS} \
${MONGO_SETTINGS} \
mocha --verbose -vvv -R tap ${TESTS}

travis: test travis-cov

.PHONY: test
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"postinstall": "node node_modules/bower/bin/bower install"
},
"engines": {
"node": "~0.10.0"
"node": "0.10.x"
},
"dependencies": {
"body-parser": "^1.4.3",
Expand All @@ -46,7 +46,6 @@
"git-rev": "git://github.com/bewest/git-rev.git"
},
"devDependencies": {
"coveralls": "~2.11.2",
"istanbul": "~0.3.5",
"mocha": "~1.20.1",
"should": "~4.0.4",
Expand Down

0 comments on commit 6171898

Please sign in to comment.