tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update INSTALL - master + support/2.0 only

This commit is contained in:
Michael Friedrich 2014-08-06 21:30:12 +02:00
parent d20ee37196
commit 65cf21bc84
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
INSTALL
View File

@ -71,15 +71,15 @@ Here's a short check-list for releases:
$ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
* Bump the version in icinga2.spec. * Bump the version in icinga2.spec.
* Update the ChangeLog and doc/1-about.md files. * Update the ChangeLog and doc/1-about.md files.
* Commit these changes to the "next" branch and create a signed tag (tags/v<VERSION>). * Commit these changes to the "master" branch and create a signed tag (tags/v<VERSION>).
$ git commit -v -a -m "Release version <VERSION>" $ git commit -v -a -m "Release version <VERSION>"
$ git tag -u EE8E0720 -m "Version <VERSION>" v<VERSION> $ git tag -u EE8E0720 -m "Version <VERSION>" v<VERSION>
$ git push --tags $ git push --tags
* Merge the "next" branch into the "master" branch (using --ff-only). * Merge the "master" branch into the "support/2.0" branch (using --ff-only).
$ git checkout master $ git checkout support/2.0
$ git merge --ff-only next $ git merge --ff-only master
$ git push origin master $ git push origin support/2.0
* Bump the version to "v<NEXT-VERSION>-dev" and commit this change to the "next" branch. * Bump the version to "v<NEXT-VERSION>-dev" and commit this change to the "master" branch.
Note: CMake determines the Icinga 2 version number using "git describe" if the Note: CMake determines the Icinga 2 version number using "git describe" if the
source directory is contained in a Git repository. Otherwise the version number source directory is contained in a Git repository. Otherwise the version number