From 62b01ed18ddcd3458109bce9823e64325e229260 Mon Sep 17 00:00:00 2001 From: oleiade Date: Wed, 13 Nov 2024 14:45:40 +0100 Subject: [PATCH] Adapt instructions to new branching and versioning strategy --- .github/ISSUE_TEMPLATE/release.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 52d2f7af869..ba8070ca99b 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -13,9 +13,9 @@ labels: ["release"] ### At the beginning of the cycle -- [ ] Create a new `release-v0.5x.0` long-lived branch and add a new release notes file using the available [template](https://github.com/grafana/k6/blob/master/release%20notes/template.md) to the [repository's `release notes` folder](https://github.com/grafana/k6/blob/master/release%20notes). +- [ ] Create a new `release-v{major}.{minor}.0` branch and add a new release notes file using the available [template](https://github.com/grafana/k6/blob/master/release%20notes/template.md) to the [repository's `release notes` folder](https://github.com/grafana/k6/blob/master/release%20notes). - [ ] Go through the potential [dependencies updates](https://github.com/grafana/k6/blob/master/Dependencies.md) and create a dedicated PR if any of them is relevant to this release. -- [ ] Create a new `release-v0.5x.0` long-lived branch on the [grafana/k6-DefinitelyTyped](https://github.com/grafana/k6-DefinitelyTyped) fork repository. +- [ ] Create a new `release-v{major}.{minor}.0` branch on the [grafana/k6-DefinitelyTyped](https://github.com/grafana/k6-DefinitelyTyped) fork repository. - [ ] Bump the version in [types/k6/package.json](https://github.com/grafana/k6-DefinitelyTyped/blob/master/types/k6/package.json#L4) to the next one. ### Release Preparation @@ -45,7 +45,7 @@ labels: ["release"] #### Documentation -- [ ] Open and merge a pull-request from `main` in the `k6-docs` repository, copying the current k6's `next` to a folder named with the k6 version (e.g. `v0.48.x`). +- [ ] Open and merge a pull-request from `main` in the `k6-docs` repository, copying the current k6's `next` to a folder named with the k6 version (e.g. `v0.55.x`). - [ ] Ensure the k6 repository release notes PR contains the correct links to the docs. #### In k6 repository @@ -53,7 +53,8 @@ labels: ["release"] - [ ] Merge the PR bumping [the k6 Go project's version](https://github.com/grafana/k6/blob/master/lib/consts/consts.go#L11-L12). - [ ] Merge the release notes PR. - [ ] Pull locally the previously merged changes. -- [ ] Create and push a new tag of the form `vX.Y.Z` using git: `git tag v0.5x.0 -m "v0.5x.0"`. +- [ ] Create a new long-lived `v{major}.{minor}.x` release branch from the `main` branch. +- [ ] Checkout the new `v{major}.{minor}.x` release branch, create and push a new tag of the form `v{major}.{minor}.0` using git: _e.g._ `git tag v0.55.0 -m "v0.55.0"`. #### Announcements