## Backport Commits
- $ ./pick.py -V 2.4.5
+ $ git checkout master
+ $ ./pick.py -V 2.4.9
+
+The script creates a new branch 'auto-merged-2.4.9' which is based on the
+current support branch. It then merges all commits from the 'master' branch which
+reference a ticket for the version that was specified.
+
+If there are any merge commits you will need to manually fix them and continue the
+rebase until no commits are left:
+
+ $ git rebase --continue
-Verify the created branch and replace it into the current support branch.
+After finishing the rebase the branch needs to be merged into the support branch:
+
+ $ git checkout support/2.4
+ $ git merge --ff-only auto-merged-2.4.9
## Authors
Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
+ $ git checkout master
$ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
## Version
* [icinga2.spec]: Version: (.*)
* [icinga2.nuspec]: <version>(.*)</version>
-* [tools/chocolateyInstall.ps1]: Icinga2-v(.*).exe
+* [tools/chocolateyInstall.ps1]: Icinga2-v(.*)-{x86,x86_64}.msi
## Changelog
Changelog:
- $ ./changelog.py -V 2.4.5
+ $ ./changelog.py -V 2.4.9
Docs:
- $ ./changelog.py -V 2.4.5 -l
+ $ ./changelog.py -V 2.4.9 -l
Wordpress:
- $ ./changelog.py -V 2.4.5 -H -l
+ $ ./changelog.py -V 2.4.9 -H -l
## Git Tag
Create a new release for the newly created Git tag.
https://github.com/Icinga/icinga2/releases
+## Chocolatey
+
+Navigate to the git repository on your Windows box which
+already has chocolatey installed. Pull/checkout the release.
+
+Create the nupkg package:
+
+ cpack
+
+Install the created icinga2 package locally:
+
+ choco install icinga2 -version 2.4.9 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+
+Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
+
## Online Documentation
SSH into the web box, navigate into `icinga2-latest/module/icinga2`