Skip to content

Commit

Permalink
Merge branch 'master' into feature/add-command-name-opt
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkMcCaskey authored Apr 12, 2019
2 parents 9c12b3f + e6e3ba5 commit 73be6c7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ run_install_dependencies: &run_install_dependencies
version: 2
jobs:
changelog:
docker:
- image: docker:stable-git
steps:
- checkout
- run:
command: ! git diff --exit-code CHANGELOG.md

# Job used for testing
lint:
docker:
Expand Down Expand Up @@ -351,6 +359,7 @@ workflows:
version: 2
main:
jobs:
- changelog
- lint
- test:
filters:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ Blocks of changes will separated by version increments.

## **[Unreleased]**
- [#351](https://github.com/wasmerio/wasmer/pull/351) Add hidden option to specify wasm program name (can be used to improve error messages)
- [#350](https://github.com/wasmerio/wasmer/pull/350) Enforce that CHANGELOG.md is updated through CI.
- [#349](https://github.com/wasmerio/wasmer/pull/349) Add [CHANGELOG.md](https://github.com/wasmerio/wasmer/blob/master/CHANGELOG.md).

0 comments on commit 73be6c7

Please sign in to comment.