Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-process: create a stable branch when preparing a new release #2993

Merged
merged 1 commit into from
Jun 10, 2020
+16 −9
Merged

release-process: create a stable branch when preparing a new release #2993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changelog/2993.process.md
View file
Open in desktop
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
View file
Open in desktop
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/${TAG_VERSION}.x v${TAG_VERSION}
git push -u origin stable/${TAG_VERSION}.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