Skip to content

Commit

Permalink
documentation: add release documentation
Browse files Browse the repository at this point in the history
Adding information about how to release claircore from main and from a
release branch.

Signed-off-by: crozzy <[email protected]>
  • Loading branch information
crozzy committed Jan 2, 2025
1 parent 6bbe356 commit faf4f98
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/contributor.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

These topics cover helpful tips for contributing to Claircore.

- [Changelog](./contributor/changelog.md)
- [Local Development](./contributor/local-dev.md)
- [Logging](./contributor/logging.md)
- [Misc](./contributor/misc.md)
- [Releases](./contributor/releases.md)
- [Tests](./contributor/tests.md)
39 changes: 39 additions & 0 deletions docs/contributor/releases.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Releases

Claircore releases are cut as and when they are needed.

Traditionally releases are always cut from the `main` branch so as not to complicate
the release process, however, on rare occasions when a fix is time-sensitive then
cutting a release from a release branch is possible.

## Process

> **_NOTE:_** Ensure changelog entries have been created for the relevant commits.
> (see [Changelog documentation](./changelog.md))
### From main

```sh
.github/scripts/prepare-release -b main -r upstream v1.x.x
```

Follow the `prepare-release` command's instructions to merge changelog updates and release the tag.

### From release branch

First create the relevant release branch (e.g if you are releasing `v1.6.1` create `release-1.6` from the
previous tag (in this case `v1.6.0`)). Then backport any commits and push up the release branch.

```sh
git branch release-1.x v1.x.x
git cherry-pick -x {commit sha}
git push upstream release-1.x
```

Finally, prepare the release specifying the release branch.

```sh
.github/scripts/prepare-release -b release-1.x -r upstream v1.x.x
```

Follow the `prepare-release` command's instructions to merge changelog updates and release the tag.

0 comments on commit faf4f98

Please sign in to comment.