Skip to content

Commit

Permalink
Added hotfix release docu (#179)
Browse files Browse the repository at this point in the history
Co-authored-by: Matthias Rinck <[email protected]>
  • Loading branch information
alxsap and rinckm authored Nov 10, 2020
1 parent 526bcb6 commit 67e1d69
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
11 changes: 11 additions & 0 deletions changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@
- version: "NEXT"
date: TBD
changes:

- type: internal
impact: patch
title: The release pipeline is now enabled for hotfix releases
description: See [developer documentation](https://github.com/SAP/stewardci-core/blob/master/docs/development/README.md#hotfix-releases) for more information.
warning:
upgradeNotes:
deprecations:
pullRequestNumber: 179
jiraIssueNumber: 316

- title: Upgrade Go dependencies
type: internal
impact: patch
Expand Down
19 changes: 19 additions & 0 deletions docs/development/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,25 @@ Although the controller images and the Helm chart are independent they are alway
- Prepare the next dev version in `prepare-<version>` by updating `version` and `appVersion` in Chart.yaml with an incremented patch version and `-dev` suffix.
- Merge the `prepare-<version>` branch into the main branch and delete the `prepare-<version>` branch.

## Hotfix Releases

To release a hotfix based on a released version (assuming `v1.2.3` below) do the following.

- Prepare a new commit, based on the "next dev" commit which follows the release tag `v1.2.3`
- Adjust the `version` and `appVersion` in [/charts/steward/Chart.yaml](https://github.com/SAP/stewardci-core/blob/master/charts/steward/Chart.yaml) to `v1.2.3-hotfix1`
- Add a hotfix changelog entry to the changelog.yamls version "NEXT"
- Commit the changes via `git commit --amend` and rename the commit message (to get rid the "next dev" commit)
- Push the changes to a **branch** `v1.2.3-hotfix1` (or work with a pull request targeting branch `v1.2.3-hotfix1`)
- Trigger the release pipeline for branch `v1.2.3-hotfix1`
- Approve the release stage

The pipeline will now create a hotfix release.

:warning: Manual post-release steps!

- Merge the `v1.2.3-hotfix1` **tag** into the master branch. You will have to resolve conflicts - take the version from the master branch, make sure to keep all changelog entries.
- Delete the `v1.2.3-hotfix1` **branch**.

## Contribution

You are welcome to contribute to this project via Pull Requests.
Expand Down

0 comments on commit 67e1d69

Please sign in to comment.