Use dependency graph when deleting objects

[icinga2] / RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
index 0392d9a2ada9dfad9b637777eaeb14a25432543e..903683bd6fef56682f28a5670514b9d0c7a15b56 100644 (file)
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -5,14 +5,38 @@ https://dev.icinga.org/projects/i2/roadmap
 
 # Release Workflow
 
+## Authors
+
 Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
 
     $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
 
-Update the version number in the icinga2.spec file.
+## Version
+
+Update the version number in the following files:
+
+* [icinga2.spec]: Version: (.*)
+* [icinga2.nuspec]: <version>(.*)</version>
+* [tools/chocolateyInstall.ps1]: Icinga2-v(.*).exe
+
+## Changelog
 
 Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files using
-the changelog.py script.
+the changelog.py script. Also generate HTML for the wordpress release announcement.
+
+Changelog:
+
+    $ ./changelog.py --version 2.3.5 --project i2
+
+Docs:
+
+    $ ./changelog.py --version 2.3.5 --project i2 --links
+
+Wordpress:
+
+    $ ./changelog.py --version 2.3.5 --project i2 --html --links
+
+## Git Tag
 
 Commit these changes to the "master" branch:
 
@@ -38,8 +62,15 @@ Push the tag.
 For major releases: Create a new "support" branch:
 
     $ git checkout master
-    $ git checkout -b support/2.x
-    $ git push -u origin support/2.x
+    $ git checkout -b support/2.3
+    $ git push -u origin support/2.3
+
+For minor releases: Push the support branch and cherry-pick the release commit into master:
+
+    $ git push -u origin support/2.3
+    $ git checkout master
+    $ git cherry-pick support/2.3
+    $ git push origin master
 
 # External Dependencies
 
@@ -54,8 +85,11 @@ For major releases: Create a new "support" branch:
 Example for CentOS7:
 
     $ sudo docker run -ti centos:latest bash
+
     # yum -y install http://packages.icinga.org/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
-    # yum -y install icinga
+    # yum -y install icinga2
+    # icinga2 daemon -C
+
     # systemctl start icinga2
     # tail -f /var/log/icinga2/icinga2.log