Skip to content

Commit 5212270

Browse files
committed
clean
1 parent 5b12eb9 commit 5212270

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

doc/fluid/dev/releasing_process_cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PaddlePaddle每次发新的版本,遵循以下流程:
77
1.`develop`分支派生出新的分支,分支名为`release/版本号`。例如,`release/0.10.0`
88
2. 将新分支的版本打上tag,tag为`版本号rc-Patch号`。例如,第一个tag为`0.10.0-rc0`
99
3. 新分支一般不接受新的feature和优化。QA在release分支上进行测试。研发基于最新的develop开发。
10-
4. QA和研发发现的bug,在develop上修复验证后,cherry-pick到release分支。直到release分支相对稳定。
10+
4. QA和研发发现的bug,在develop上修复验证后,cherry-pick修复到release分支。直到release分支相对稳定。
1111
5. 如果有需要,在release分支最新代码上打上新的tag,比如`0.10.0-rc1`,让更多的用户加入测试。重复3-4步。
1212
6. release分支稳定后,打上正式的release tag,比如`0.10.0`
1313
7. 将这个版本的python wheel包发布到pypi。
@@ -68,7 +68,7 @@ PaddlePaddle开发过程使用[Trunk Based Development](https://trunkbaseddevelo
6868

6969
* 其他开发者fork的feature branch。
7070
* 建议,开发者的feature branch需要同步主版本库的`develop`分支。
71-
* 建议,开发者的feature branch需要基于朱版本库中的`develop`分支。
71+
* 建议,开发者的feature branch需要基于主版本库中的`develop`分支。
7272
* 当feature branch开发完毕后,向PaddlePaddle的主版本库提交`Pull Reuqest`,进而进行代码评审。
7373
* 在评审过程中,开发者修改自己的代码,可以继续在自己的feature branch提交代码。
7474

doc/fluid/dev/releasing_process_en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Each time we release a new PaddlePaddle version, we should follow the below step
77
1. Create a new release branch from `develop`,named `release/[version]`. E.g.,`release/0.10.0`
88
2. Create a new tag for the release branch, tag format: `version-rc.Patch`. E.g. the first tag is `0.10.0-rc0`
99
3. New release branch normally doesn't accept new features or optimizations. QA will test on the release branch. Developer should develop based on `develop` branch.
10-
4. If QA or Developer find bugs. They should first fix and verity on `develop` branch. Then cherry-pick to the release branch. Wait until the release branch is stable.
10+
4. If QA or Developer find bugs. They should first fix and verify on `develop` branch. Then cherry-pick the fix to the release branch. Wait until the release branch is stable.
1111
5. If necessary, create a new tag on the relese branch, e.g. `0.10.0-rc1`. Involve more users to try it and repeat step 3-4.
1212
6. After release branch is stable,Create the official release tag,such as `0.10.0`.
1313
7. Release the python wheel package to pypi.

0 commit comments

Comments
 (0)