Skip to content

Commit

Permalink
release-process: create a stable branch when preparing a new release
Browse files Browse the repository at this point in the history
Currently we create a stable release branch only once we need to backport some
changes. This PR changes the release process to create the stable branch when
creating a new release. This will ensure CI jobs hooked to stable/ branches,
such as building a release tagged CI docker image will be run for every
release.
  • Loading branch information
ptrus committed Jun 10, 2020
1 parent 15ae821 commit 67f51ce
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
7 changes: 7 additions & 0 deletions .changelog/2993.process.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
release: create a stable branch when preparing a new release

Currently we create a stable release branch only once we need to backport some
changes. This PR changes the release process to create the stable branch when
creating a new release. This will ensure CI jobs hooked to stable/ branches,
such as building a release tagged CI docker image will be run for every
release.
18 changes: 9 additions & 9 deletions docs/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,15 @@ while tagging the next release.

After those checks have passed, it will ask for confirmation before proceeding.

### Create a `stable/YY.MINOR.x` branch

Prepare a new stable branch from the tag and push it to the origin:

```bash
git checkout -b stable/${YY}.${TAG_MINOR}.x v${TAG_VERSION}
git push -u origin stable/${YY}.${TAG_MINOR}.x
```

### Ensure a GitHub release was published

After the tag with the next release is pushed to the [canonical git repository],
Expand Down Expand Up @@ -140,15 +149,6 @@ BACKPORT_VERSION="20.1"

[Versioning scheme]: versioning.md

### Create a `stable/YY.MINOR.x` branch

Prepare a new branch from the appropriate tag and push it to the origin:

```bash
git checkout -b stable/${BACKPORT_VERSION}.x v${BACKPORT_VERSION}
git push -u origin stable/${BACKPORT_VERSION}.x
```

### Back-port the changes

Create a new branch, e.g.
Expand Down

0 comments on commit 67f51ce

Please sign in to comment.