From 5b12eb9294c4e0a109d4cd6224eff4c18948466f Mon Sep 17 00:00:00 2001 From: Xin Pan Date: Tue, 11 Sep 2018 13:13:55 +0800 Subject: [PATCH] clean --- doc/fluid/dev/releasing_process_cn.md | 6 ++--- doc/fluid/dev/releasing_process_en.md | 35 +-------------------------- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/doc/fluid/dev/releasing_process_cn.md b/doc/fluid/dev/releasing_process_cn.md index b3ce2b1b024..b1b6595effd 100644 --- a/doc/fluid/dev/releasing_process_cn.md +++ b/doc/fluid/dev/releasing_process_cn.md @@ -5,7 +5,7 @@ PaddlePaddle使用Trunk Based Development，使用[Semantic Versioning](http://s PaddlePaddle每次发新的版本，遵循以下流程: 1. 从`develop`分支派生出新的分支，分支名为`release/版本号`。例如，`release/0.10.0` -2. 将新分支的版本打上tag，tag为`版本号rc.Patch号`。第一个tag为`0.10.0-rc0`。 +2. 将新分支的版本打上tag，tag为`版本号rc-Patch号`。例如，第一个tag为`0.10.0-rc0`。 3. 新分支一般不接受新的feature和优化。QA在release分支上进行测试。研发基于最新的develop开发。 4. QA和研发发现的bug，在develop上修复验证后，cherry-pick到release分支。直到release分支相对稳定。 5. 如果有需要，在release分支最新代码上打上新的tag，比如`0.10.0-rc1`，让更多的用户加入测试。重复3-4步。 @@ -67,8 +67,8 @@ PaddlePaddle开发过程使用[Trunk Based Development](https://trunkbaseddevelo * `master`分支因为历史原因，已经废弃。 * 其他开发者fork的feature branch。 - * 建议，开发者fork的版本库使用`develop`分支同步主版本库的`develop`分支 - * 建议，开发者fork的版本库中，再基于`develop`版本fork出自己的feature branch。 + * 建议，开发者的feature branch需要同步主版本库的`develop`分支。 + * 建议，开发者的feature branch需要基于朱版本库中的`develop`分支。 * 当feature branch开发完毕后，向PaddlePaddle的主版本库提交`Pull Reuqest`，进而进行代码评审。 * 在评审过程中，开发者修改自己的代码，可以继续在自己的feature branch提交代码。 diff --git a/doc/fluid/dev/releasing_process_en.md b/doc/fluid/dev/releasing_process_en.md index e3ca3acd22e..a4ea4f6fb06 100644 --- a/doc/fluid/dev/releasing_process_en.md +++ b/doc/fluid/dev/releasing_process_en.md @@ -4,23 +4,8 @@ PaddlePaddle manages its branches using "git-flow branching model", and [Semanti Each time we release a new PaddlePaddle version, we should follow the below steps: -1. Fork a new branch from `develop` named `release/[version]`, e.g. `release/0.10.0`. -1. Push a new tag on the release branch, the tag name should be like `[version]rc.patch`. The - first tag should be `0.10.0rc1`, and the second should be `0.10.0.rc2` and so on. -1. After that, we should do: - * Run all regression test on the Regression Test List (see PaddlePaddle TeamCity CI), to confirm - that this release has no major bugs. - * If regression test fails, we must fix those bugs and create a new `release/[version]` - branch from previous release branch. - * Modify `python/setup.py.in`, change the version number and change `ISTAGED` to `True`. - * Publish PaddlePaddle release wheel packages to pypi (see below instructions for detail). - * Update the Docker images (see below instructions for detail). -1. After above step, merge `release/[version]` branch to master and push a tag on the master commit, - then merge `master` to `develop`. -1. Update the Release Note. - 1. Create a new release branch from `develop`，named `release/[version]`. E.g.，`release/0.10.0` -2. Create a new tag for the release branch, tag format: `version-rc.Patch`. The first tag is `0.10.0-rc0`。 +2. Create a new tag for the release branch, tag format: `version-rc.Patch`. E.g. the first tag is `0.10.0-rc0`。 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. 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. 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. @@ -105,24 +90,6 @@ Tags that need to be updated are: You can then checkout the latest pushed tags at https://hub.docker.com/r/paddlepaddle/paddle/tags/. -## PaddlePaddle 分支规范 - -PaddlePaddle开发过程使用[Trunk Based Development](https://trunkbaseddevelopment.com/) 开发规范。 - -* `develop`分支为开发(develop branch)版本分支。每一个`develop`分支的版本都经过单元测试。并且会经过模型回归测试。 -* `release/版本号`分支为每一次Release时建立的临时分支。release分支主要用于测试，bug修复和最终发版。 -* `master`分支因为历史原因，已经废弃。 - -* 其他开发者fork的feature branch。 - * 建议，开发者fork的版本库使用`develop`分支同步主版本库的`develop`分支 - * 建议，开发者fork的版本库中，再基于`develop`版本fork出自己的feature branch。 - * 当feature branch开发完毕后，向PaddlePaddle的主版本库提交`Pull Reuqest`，进而进行代码评审。 - * 在评审过程中，开发者修改自己的代码，可以继续在自己的feature branch提交代码。 - -## PaddlePaddle回归测试列表 - -TODO - ## Branching Model PaddlePaddle uses [Trunk Based Development](https://trunkbaseddevelopment.com/) as our branching model. -- GitLab