Skip to content

Commit 85727b5

Browse files
committed
Add feature branch policy
Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
1 parent 3e65c40 commit 85727b5

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

.github/ISSUE_TEMPLATE/750-RFC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ body:
4040
attributes:
4141
label: Any Other Things.
4242
description: >
43-
Any other things you would like to mention.
43+
Any other things you would like to mention, such as feature branch request.
4444
validations:
4545
required: false
4646
- type: markdown

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Below is maintained branches:
7777
| v0.7.1-dev | Unmaintained | Only doc fixed is allowed |
7878
| v0.7.3-dev | Maintained | CI commitment for vLLM 0.7.3 version, only bug fix is allowed and no new release tag any more. |
7979
| v0.9.1-dev | Maintained | CI commitment for vLLM 0.9.1 version |
80+
| rfc/feature-name | Maintained | [Feature branches](https://vllm-ascend.readthedocs.io/en/latest/community/versioning_policy.html#feature-branches) for collaboration |
8081

8182
Please refer to [Versioning policy](https://vllm-ascend.readthedocs.io/en/latest/community/versioning_policy.html) for more details.
8283

README.zh.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ vllm-ascend有主干分支和开发分支。
7676
| v0.7.1-dev | Unmaintained | 只允许文档修复 |
7777
| v0.7.3-dev | Maintained | 基于vLLM v0.7.3版本CI看护, 只允许Bug修复,不会再发布新版本 |
7878
| v0.9.1-dev | Maintained | 基于vLLM v0.9.1版本CI看护 |
79+
|rfc/feature-name| Maintained | 为协作创建的[特性分支](https://vllm-ascend.readthedocs.io/en/latest/community/versioning_policy.html#feature-branches) |
7980

8081
请参阅[版本策略](https://vllm-ascend.readthedocs.io/en/latest/community/versioning_policy.html)了解更多详细信息。
8182

docs/source/community/versioning_policy.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,17 @@ Usually, each minor version of vLLM (such as 0.7) will correspond to a vLLM Asce
8484
| v0.7.3-dev | Maintained | CI commitment for vLLM 0.7.3 version |
8585
| v0.7.1-dev | Unmaintained | Replaced by v0.7.3-dev |
8686

87+
### Feature branches
88+
89+
| Branch | Status | RFC link | Merge plan | Mentor |
90+
|------------|--------------|---------------------------------------|------------|--------|
91+
92+
- Branch: The feature branch should be created with a prefix `rfc/` followed by the feature name, such as `rfc/feature-name`.
93+
- Status: The status of the feature branch is `Maintained` until it is merged into the main branch or deleted.
94+
- RFC link: The feature branch should be created with a corresponding RFC issue. The creation of a feature branch requires an RFC and approval from at least two maintainers.
95+
- Merge plan: The final goal of a feature branch is to merge it into the main branch. If it exceeds 3 months, the mentor maintainer should evaluate whether to delete the branch.
96+
- Mentor: The mentor should be a vLLM Ascend maintainer who is responsible for the feature branch.
97+
8798
### Backward compatibility
8899

89100
For main branch, vLLM Ascend should works with vLLM main branch and latest 1 or 2 release version. So to ensure the backward compatibility, we will do the following:

0 commit comments

Comments
 (0)