X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=RELEASE.md;h=9cfb6d638c7d42cee4c86d4925553d46fd038dc8;hb=6387f5442ec92f56f2bdaa7379b7caf02e91938c;hp=15ddafdf7d4b4b523fd4ffbbb0a03746d9f160df;hpb=ca8d06b9ee7cc4ce9eeb5dee0bbf6fda3bb57a0a;p=icinga2 diff --git a/RELEASE.md b/RELEASE.md index 15ddafdf7..9cfb6d638 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -3,7 +3,7 @@ Specify the release version. ``` -VERSION=2.7.0 +VERSION=2.7.2 ``` ## Issues @@ -21,16 +21,14 @@ Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files: ``` git checkout master -git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS +git log --use-mailmap | grep '^Author:' | cut -f2- -d' ' | sort | uniq > AUTHORS ``` ## Version -Fetch the latest spec file from the [icinga-packaging](https://github.com/icinga/icinga-packaging) -repository and verify that the latest version is set. +Update the version in the spec file: ``` -wget -O icinga2.spec https://raw.githubusercontent.com/Icinga/icinga-packaging/rpm/snapshot/icinga2/icinga2.spec gsed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec ``` @@ -61,7 +59,12 @@ Commit these changes to the "master" branch: git commit -v -a -m "Release version $VERSION" ``` -For minor releases: Cherry-pick this commit into the "support" branch. +For minor releases: Cherry-pick this commit into the "support" branch: + +``` +git checkout support/2.7 +git cherry-pick master +``` Create a signed tag (tags/v) on the "master" branch (for major releases) or the "support" branch (for minor releases). @@ -78,7 +81,13 @@ MF: git tag -u D14A1F16 -m "Version $VERSION" v$VERSION ``` -Push the tag. +NH: + +``` +git tag -u 630F89D9 -m "Version $VERSION" v$VERSION +``` + +Push the tag: ``` git push --tags @@ -156,23 +165,7 @@ Upload the package to [chocolatey](https://chocolatey.org/packages/upload). ## Online Documentation -Edit `config.yml` in the [icinga-docs-tools](https://github.com/Icinga/icinga-docs-tools) repository: - -``` -git clone git@github.com:Icinga/icinga-docs-tools.git -cd icinga-docs-tools/ -vim config.yml - -git commit -av -m "Update to Icinga 2 v$VERSION" -git push -``` - -SSH into the web VM and build the docs: - -``` -cd /var/www/docs/icinga-docs/latest/ -/usr/bin/bundle exec ./build-docs.rb -``` +Ask @bobapple to update the documentation at docs.icinga.com. ## Announcement