Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
rcmedeiros committed May 19, 2019
2 parents 1297f4a + 7b09d65 commit 15e569e
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Expand Up @@ -83,9 +83,9 @@ jobs:
- image: circleci/node:10
steps:
- checkout
- run:
name: Audit with NPM
command: npm audit
# - run:
# name: Audit with NPM
# command: npm audit
- run:
name: Install Snyk
command: npm i snyk
Expand Down
6 changes: 5 additions & 1 deletion README.md
@@ -1,4 +1,7 @@
# TypeScript/JavaScript/Node CI/CD Template

See the [full documentation here](https://rcmedeiros.github.io/template/).

[![npm version](https://badge.fury.io/js/%40rcmedeiros%2Ftslint-config.svg)](https://badge.fury.io/js/%40rcmedeiros%2Ftslint-config)
![npm bundle size (scoped)](https://img.shields.io/bundlephobia/min/@rcmedeiros/tslint-config.svg)
![CircleCI branch](https://img.shields.io/circleci/project/github/rcmedeiros/template/master.svg)
Expand All @@ -21,6 +24,7 @@ A [TypeScript](https://github.com/trending/typescript) project that does very li
* branch release/ deploys with [@alpha, @beta or @next](https://docs.npmjs.com/cli/dist-tag) (release candidate) tags;
* branch master submits to @latest. Those require manual approval.
* Vulnerability checks by [npm-audit](https://docs.npmjs.com/cli/audit) and [Snyk](https://snyk.io/)
* Dependencies *up-to-dateness* kept by [Greenkeeper](https://greenkeeper.io)
* Compliance with [SemVer](https://semver.org/);
* Tests are implemented with [Mocha](https://mochajs.org/) and [Chai](https://www.chaijs.com/)
* Test coverage assessed with [Istanbul.js](https://istanbul.js.org/).
Expand All @@ -29,10 +33,10 @@ A [TypeScript](https://github.com/trending/typescript) project that does very li
* Lots of fine grained measurements by [Sonarcloud](https://sonarcloud.io)
* Documentation hosted by [ReadTheDocs](https://readthedocs.org/).


## Up Next

* Spies, Stubs and Mocks by [Sinon.JS](https://sinonjs.org/) (or maybe [JsMockito](https://jsmockito.org/))
* [Greenkeeper](https://greenkeeper.io)

## And now Sonarcloud badges...
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=rcmedeiros_template&metric=bugs)](https://sonarcloud.io/dashboard?id=rcmedeiros_template)
Expand Down
4 changes: 2 additions & 2 deletions docs/pipeline/index.html
Expand Up @@ -814,8 +814,8 @@


<h1 id="pipeline">Pipeline</h1>
<p>There are <a href="https://blog.overops.com/jenkins-vs-travis-ci-vs-circle-ci-vs-teamcity-vs-codeship-vs-gitlab-ci-vs-bamboo/">countless options</a> for CI/CD tool, and all of them will suit all of your needs. I already work with GitLab CI/CD and Travis is quite popular so I chose to try this because I thought it faster to learn and I fancy the UI.<br />
There are three workflows:</p>
<p>There are <a href="https://blog.overops.com/jenkins-vs-travis-ci-vs-circle-ci-vs-teamcity-vs-codeship-vs-gitlab-ci-vs-bamboo/">countless options</a> for CI/CD tool, and all of them will suit all of your needs. I already work with GitLab CI/CD and Travis is quite popular so I chose to try this because I thought it faster to learn and I fancy the UI.</p>
<p>There are three workflows:</p>
<ul>
<li><strong>development_commit</strong>: Commits to branch develop;</li>
<li><strong>staging_commit</strong>: Commits to release or master branches;</li>
Expand Down
52 changes: 36 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 15e569e

Please sign in to comment.