From fe0fef197a18460bd2dd9355e44dfc55283f1756 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Wed, 25 Aug 2021 14:16:04 +0800 Subject: [PATCH] update PR template for v5.2 (#6166) --- .github/pull_request_template.md | 1 + CONTRIBUTING.md | 4 +++- README.md | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e402b0313569f..b43061138a84e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,6 +19,7 @@ By default, **CHOOSE MASTER ONLY** so your changes will be applied to the next T For details, see [tips for choosing the affected versions](https://github.com/pingcap/docs/blob/master/CONTRIBUTING.md#guideline-for-choosing-the-affected-versions). - [ ] master (the latest development version) +- [ ] v5.2 (TiDB 5.2 versions) - [ ] v5.1 (TiDB 5.1 versions) - [ ] v5.0 (TiDB 5.0 versions) - [ ] v4.0 (TiDB 4.0 versions) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6c8c464332407..df71d03af55db 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,11 +29,12 @@ Before you contribute, please take a quick look at some general information abou ### Learn about docs versions -Currently, we maintain seven versions of TiDB documentation, each with a separate branch: +Currently, we maintain the following versions of TiDB documentation, each with a separate branch: | Docs branch name | Version description | | :--- | :--- | | `master` branch | the latest development version | +| `release-5.2` branch | the 5.2 stable version | | `release-5.1` branch | the 5.1 stable version | | `release-5.0` branch | the 5.0 stable version | | `release-4.0` branch | the 4.0 stable version | @@ -52,6 +53,7 @@ Currently, we maintain seven versions of TiDB documentation, each with a separat - If your changes apply to only one docs version, just submit a PR to the corresponding version branch. - If your changes apply to multiple docs versions, you don't have to submit a PR to each branch. Instead, after you submit your PR, trigger the ti-chi-bot to submit a PR to other version branches by adding one or several of the following labels as needed. Once the current PR is merged, ti-chi-bot will start to work. + - `needs-cherry-pick-5.2` label: ti-chi-bot will submit a PR to the `release-5.2` branch. - `needs-cherry-pick-5.1` label: ti-chi-bot will submit a PR to the `release-5.1` branch. - `needs-cherry-pick-5.0` label: ti-chi-bot will submit a PR to the `release-5.0` branch. - `needs-cherry-pick-4.0` label: ti-chi-bot will submit a PR to the `release-4.0` branch. diff --git a/README.md b/README.md index 3049740008c1b..ee9284332a9be 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,8 @@ Currently, we maintain the following versions of TiDB documentation in different | Branch name | TiDB docs version | | :---------|:----------| | [`master`](https://github.com/pingcap/docs/tree/master) | The latest development version | -| [`release-5.1`](https://github.com/pingcap/docs/tree/release-5.1) | 5.1 version | +| [`release-5.2`](https://github.com/pingcap/docs/tree/release-5.2) | 5.2 stable version | +| [`release-5.1`](https://github.com/pingcap/docs/tree/release-5.1) | 5.1 stable version | | [`release-5.0`](https://github.com/pingcap/docs/tree/release-5.0) | 5.0 stable version | | [`release-4.0`](https://github.com/pingcap/docs/tree/release-4.0) | 4.0 stable version | | [`release-3.1`](https://github.com/pingcap/docs/tree/release-3.1) | 3.1 stable version |