Skip to content

Commit

Permalink
Merge pull request #28 from stjohnjohnson/FixPipeline
Browse files Browse the repository at this point in the history
fix: Simplify pipeline and use new SD pipeline
  • Loading branch information
stjohnjohnson authored Mar 2, 2017
2 parents d5b2e98 + 566423a commit 52ab70b
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ Default values are:
[npm-url]: https://npmjs.org/package/jenkins-mocha
[cov-image]: https://coveralls.io/repos/github/stjohnjohnson/jenkins-mocha/badge.svg?branch=master
[cov-url]: https://coveralls.io/github/stjohnjohnson/jenkins-mocha?branch=master
[status-image]: https://cd.screwdriver.cd/pipelines/645af0ac1b2ed3cf24d3819d94e9af1b9007dfe8/badge
[status-url]: https://cd.screwdriver.cd/pipelines/645af0ac1b2ed3cf24d3819d94e9af1b9007dfe8
[status-image]: https://cd.screwdriver.cd/pipelines/63/badge
[status-url]: https://cd.screwdriver.cd/pipelines/63
[vul-image]: https://snyk.io/test/github/stjohnjohnson/jenkins-mocha.git/badge.svg
[vul-url]: https://snyk.io/test/github/stjohnjohnson/jenkins-mocha.git
[issues-image]: https://img.shields.io/github/issues/stjohnjohnson/jenkins-mocha.svg
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"devDependencies": {
"chai": "^3.0.0",
"coveralls": "^2.11.13",
"coveralls": "^2.11.15",
"mockery": "^2.0.0",
"sinon": "^1.10.3"
},
Expand Down
42 changes: 22 additions & 20 deletions screwdriver.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
workflow:
- publish
- publish

shared:
image: node:6
image: node:6

jobs:
main:
steps:
- setup: git clone https://gist.github.com/3d2388b2a7ba658cdcdaffa8cd874e50.git ci
- install: npm install
- test: npm test
- coverage: ./ci/coverage.sh
secrets:
# Uploading coverage information to coveralls
- COVERALLS_REPO_TOKEN
main:
steps:
- install: npm install
- test: npm test
- coverage: |
export CI_PULL_REQUEST=${SD_PULL_REQUEST}
export COVERALLS_SERVICE_NAME=screwdriver
cat ./artifacts/coverage/lcov.info | ./node_modules/.bin/coveralls
secrets:
# Uploading coverage information to coveralls
- COVERALLS_REPO_TOKEN

publish:
steps:
- install: npm install semantic-release
- publish: npm run semantic-release
secrets:
# Publishing to NPM
- NPM_TOKEN
# Pushing releases to Git
- GH_TOKEN
publish:
steps:
- install: npm install semantic-release
- publish: npm run semantic-release
secrets:
# Publishing to NPM
- NPM_TOKEN
# Pushing releases to Git
- GH_TOKEN

0 comments on commit 52ab70b

Please sign in to comment.