Skip to content

Commit

Permalink
Merge pull request #4 from holidayextras/circle
Browse files Browse the repository at this point in the history
Moving to CircleCi
  • Loading branch information
Rob Johnson committed Sep 30, 2015
2 parents 974d82a + 4eed0b9 commit 8fd17f6
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# plugin-harvest

[![Build Status](https://api.shippable.com/projects/54ff09505ab6cc135296f99a/badge?branchName=master)](https://app.shippable.com/projects/54ff09505ab6cc135296f99a/builds/latest)
[![Circle CI](https://circleci.com/gh/holidayextras/plugin-harvest/tree/master.svg?style=svg&circle-token=05a70f71a614d4fe9b05c67972e171fec72a3687)](https://circleci.com/gh/holidayextras/plugin-harvest)

## About

Expand Down
34 changes: 34 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
machine:
node:
version: 0.10.38
dependencies:
pre:
- npm install git+ssh://git@github.com:holidayextras/deployment-helpers.git
- node_modules/deployment-helpers/nodeApps/preRelease.sh
- npm install grunt grunt-cli istanbul mocha -g
test:
pre:
- mkdir -p $CIRCLE_TEST_REPORTS/unit
- mkdir -p $CIRCLE_TEST_REPORTS/coverage
override:
- grunt jshint
- grunt jscs
- istanbul cover _mocha -- --timeout 15000 --recursive test/**/*Test.js -R xunit > $CIRCLE_TEST_REPORTS/unit/results.xml
post:
- cp -r ./coverage/ $CIRCLE_ARTIFACTS/coverage
deployment:
production:
branch: master
commands:
- node_modules/deployment-helpers/nodeApps/postRelease.sh production
staging:
branch: staging
commands:
- node_modules/deployment-helpers/nodeApps/postRelease.sh staging

experimental:
notify:
branches:
only:
- master
- staging
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plugin-harvest",
"description": "A hapi Plugin to connect to a CouchDB database with encoded baskets",
"version": "1.3.0",
"version": "1.4.0",
"homepage": "https://github.com/holidayextras/plugin-harvest",
"author": {
"name": "Shortbreaks",
Expand All @@ -17,17 +17,18 @@
"node": ">= 0.10.0"
},
"scripts": {
"test": "grunt jshint && grunt jscs && istanbul cover _mocha -- --recursive -R spec"
"test": "node_modules/deployment-helpers/nodeApps/preRelease.sh && grunt jshint && grunt jscs && istanbul cover _mocha -- --recursive -R spec"
},
"dependencies": {
"harvest": "git+ssh://git@github.com:holidayextras/harvest.git#v1.3.0",
"harvest": "git+ssh://git@github.com:holidayextras/harvest.git#v1.4.0",
"lodash": "3.1.0",
"nano": "6.0.2",
"q": "1.1.2"
},
"devDependencies": {
"chai": "1.9.1",
"chai-as-promised": "4.3.0",
"deployment-helpers": "git+ssh://git@github.com:holidayextras/deployment-helpers.git",
"grunt": "0.4.5",
"grunt-contrib-jshint": "0.11.0",
"grunt-jscs": "1.5.0",
Expand Down
34 changes: 0 additions & 34 deletions shippable.yml

This file was deleted.

0 comments on commit 8fd17f6

Please sign in to comment.