Skip to content

Commit

Permalink
Merge pull request #16 from lparsons/prepare_release_8.0.1
Browse files Browse the repository at this point in the history
Prepare for 8.0.1 release
  • Loading branch information
eugenemel authored Sep 14, 2017
2 parents 3b85263 + 3b98b9e commit 2d5e7ae
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).


## [Unreleased][]
## [8.0.1][]
### Added
- Detect dual 13C/2H labeled isotopes @lparsons

Expand Down Expand Up @@ -43,6 +43,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [20161028][] - 2016-10-28
- TODO - Document changes

[Unreleased]: https://github.com/eugenemel/maven/compare/8.0.0...HEAD
[8.0.1]: https://github.com/eugenemel/maven/compare/8.0.0...8.0.1
[8.0.0]: https://github.com/eugenemel/maven/compare/20161028...8.0.0
[20161028]: https://github.com/eugenemel/maven/compare/92cf1d16dfc7d9f6bf4394890a06c3ecbed2ba1a...20161028
24 changes: 17 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,31 @@ Tagged versions are automatically released on GitHub releases.

## Releases

1. Update `CHANGELOG.md` from `Unreleased` to `<version>`, update diff links.
1. Create branch `prepare_release_<version>`.

2. Merge all PRs, ensure pipelines pass. Be sure to update local repo with
merge commit (e.g. `git checkout master; git fetch upstream master; git
merge upstream master`)
2. Update `CHANGELOG.md` from `Unreleased` to `<version>`, update diff links.

3. Tag with new version:
3. Submit Pull Request for the `prepare_release_<version>` branch.

4. Once other members agree to release, merge the PR and ensure Travis and
Appveyor pass.

5. Update local repo with the merge commit:
```
git checkout master
git fetch upstream master
git merge upstream master
```
6. Tag with new version:
```
git tag -a <version>
git push --tags
```
4. Check GitHub releases, add helpful release notes, etc.
7. Check GitHub releases, add helpful release notes, etc.
5. Prepare for new development (can be pushed directly to master):
8. Prepare for new development (can be pushed directly to master):
1. Update `CHNAGELOG.md` to add `Unreleased` section, add diff link:
```
Expand Down

0 comments on commit 2d5e7ae

Please sign in to comment.