diff --git a/Makefile b/Makefile index 6adee68..f95b79b 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,5 @@ version: deps goxc -wc -pv=$(v) git add .goxc.json git commit -m "Release $(v)" - git tag $(v) .PHONY: all bump build release deb diff --git a/README.md b/README.md index 0a78fd6..3cfea4c 100644 --- a/README.md +++ b/README.md @@ -327,6 +327,21 @@ The following section describes known limitations in `marathon-consul`. Later on, if another deployment takes place, new services are registered with a new name, the old ones are not being deregistered though. A scheduled sync is required to wipe them out. +## Release + +To release new version of marathon-consul follow steps: + +1. Commit all chagnes you need for release to master branch. +2. `git checkout master` +4. `git checkout -b release/` e.g., `git checkout -b release/1.3.1` +5. `make version v=` e.g., `make version v=1.3.1` +6. `git push` +7. Create pull request from branch `release/` to master. +8. Once pull request get merged put tag on this commit (remember to update your master with `git pull`) + `git tag -f` e.g., `git tag 1.3.1 -f`. Create annotated tag with release notes in it. +9. Travis will automatically prepare github release from tag on master. Go there and update release notes. +10. Copy github release to bintray. + ## License Marathon-consul is released under the Apache 2.0 license (see [LICENSE](LICENSE))