Skip to content

Commit

Permalink
fix: merge remote-tracking branch 'MYoshi/feature/semantic-release'
Browse files Browse the repository at this point in the history
Conflicts:

  package-lock.json
  • Loading branch information
stelcheck committed Jul 27, 2018
2 parents d0f4d77 + 972813e commit 7de23a2
Show file tree
Hide file tree
Showing 5 changed files with 8,490 additions and 4,273 deletions.
51 changes: 51 additions & 0 deletions .gitmessage
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
###
# Commits must follow the Angular Commit Message Convention
# https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines
###

###
# Please put a title above this line. The title must follow
# the following format:
#
# <type>(<scope>): <subject>
#
# The scope should be the name of the npm package affected (as perceived by the
# person reading the changelog generated from commit messages.
#
# The subject contains succinct description of the change.
#
# Valid types are:
#
# - build: Changes that affect the build system or external dependencies
# (example scopes: gulp, broccoli, npm)
# - ci: Changes to our CI configuration files and scripts (example scopes:
# Travis, Circle, BrowserStack, SauceLabs)
# - docs: Documentation only changes
# - feat: A new feature
# - fix: A bug fix
# - perf: A code change that improves performance
# - refactor: A code change that neither fixes a bug nor adds a feature
# - style: Changes that do not affect the meaning of the code (white-space,
# formatting, missing semi-colons, etc)
# - test: Adding missing tests or correcting existing tests
###


###
# Insert a body above this line (optional)
#
# The body should include the motivation for the change and contrast this with
# previous behavior.
###


###
# Insert a footer above this line (optional)
#
# The footer should contain any information about Breaking Changes and is also
# the place to reference GitHub
# issues that this commit closes.
#
# Breaking Changes should start with the word BREAKING CHANGE: with a space or
# two newlines. The rest of the commit message is then used for this.
###
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,8 @@ before_script: greenkeeper-lockfile-update
after_script: greenkeeper-lockfile-upload

script:
- travis_retry npm run test
- travis_retry npm run report:coverage
- if [ "$TRAVIS_BRANCH" = "master" ]; then commitlint --from=master; fi && travis_retry npm run test
- if [ "$TRAVIS_BRANCH" = "master" ]; then commitlint --from=master; fi && travis_retry npm run report:coverage

after_success:
- npm run travis-deploy-once "npm run semantic-release"
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = {extends: ['@commitlint/config-angular']}
Loading

0 comments on commit 7de23a2

Please sign in to comment.