Skip to content

Commit 7d93f15

Browse files
author
Amanda Butler
authored
Merge pull request #543 from 0xc0170/fix_review_update
Workflow: add details for review
2 parents e403d2e + d892194 commit 7d93f15

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

docs/reference/contributing/guidelines/workflow.md

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Responsibilities:
1818

1919
The current maintainers are:
2020

21-
* [Anna Bridge](https://os.mbed.com/users/AnnaBridge).
22-
* [Martin Kojtal](https://os.mbed.com/users/Kojto).
23-
* [Jimmy Brisson](https://os.mbed.com/users/theotherjimmy).
24-
* [Shrikant Tudavekar](https://os.mbed.com/users/shrikant1213).
25-
* [Sam Grove](https://os.mbed.com/users/sam_grove).
26-
* [Cruz Monrreal](https://os.mbed.com/users/MrCruz).
27-
* [Kevin Bracey](https://os.mbed.com/users/kjbracey).
21+
- [Anna Bridge](https://os.mbed.com/users/AnnaBridge).
22+
- [Martin Kojtal](https://os.mbed.com/users/Kojto).
23+
- [Jimmy Brisson](https://os.mbed.com/users/theotherjimmy).
24+
- [Shrikant Tudavekar](https://os.mbed.com/users/shrikant1213).
25+
- [Sam Grove](https://os.mbed.com/users/sam_grove).
26+
- [Cruz Monrreal](https://os.mbed.com/users/MrCruz).
27+
- [Kevin Bracey](https://os.mbed.com/users/kjbracey).
2828

2929
### Contributions
3030

@@ -48,7 +48,7 @@ Pull requests on GitHub have to meet the following requirements to keep the code
4848
- You should always write commits to allow publication, so they can never contain confidential information, reference private documents, links to intranet locations or rude language.
4949
- Each commit should be the minimum self-contained commit for a change. A commit should always result in a new state that is again in a compilable state. You should (if possible) split large changes into logical smaller commits that help reviewers follow the reasoning behind the full change.
5050
- Commits and pull request titles should follow [Chris Beam’s seven rules of great commit messages](http://chris.beams.io/posts/git-commit#seven-rules):
51-
1. Separate subject from body with a blank line.
51+
1. Separate the subject from the body with a blank line.
5252
1. Limit the subject line to 72 characters (note that this is a deviation from Beam's standard).
5353
1. Capitalize the subject line.
5454
1. Do not end the subject line with a period.
@@ -57,8 +57,9 @@ Pull requests on GitHub have to meet the following requirements to keep the code
5757
1. Use the body to explain _what_ and _why_ vs _how_.
5858
- Because we use GitHub and explicit CLAs, special commit tags that other projects may use, such as “Reviewed-by”, or “Signed-off-by”, are redundant and should be omitted. GitHub tracks who reviewed what and when, and our stack of signed CLAs shows us who has agreed to our development contribution agreement.
5959
- Prefixing your commit message with a domain is acceptable, and we recommend doing so when it makes sense. However, prefixing one's domain with the name of the repo is not useful. For example, making a commit entitled "mbed-drivers: Fix doppelwidget frobulation" to the `mbed-drivers` repo is not acceptable because it is already understood that the commit applies to `mbed-drivers`. Renaming the commit to "doppelwidget: Fix frobulation" would be better, if we presume that "doppelwidget" is a meaningful domain for changes, because it communicates that the change applies to the doppelwidget area of `mbed-drivers`.
60-
- All new features and enhancements require documentation, tests and user guides for us to accept them. Please link each pull request to all relevant documentation and testing pull requests.
60+
- All new features and enhancements require documentation, tests and user guides for us to accept them. Please link each pull request to all relevant documentation and test pull requests.
6161
- Avoid merging commmits. (Always rebase when possible.)
62+
- Comment in the pull request on every change (rebase or new commits). This helps reviewers to be up to date with changes
6263
- Pull requests should fix a bug, add a feature or refactor.
6364

6465
#### Release versioning
@@ -96,7 +97,7 @@ Release: patch
9697

9798
#### Refactor
9899

99-
Refactors are intended for feature releases if they are not fixing specific issues because they can introduce new issues.
100+
Refactors are intended for feature releases, if they are not fixing specific issues, because they can introduce new issues.
100101

101102
Release: feature
102103

@@ -108,7 +109,7 @@ Release: patch
108109

109110
#### Feature
110111

111-
New features target feature releases. A new feature can be integrated only if the feature supports most of the targets (if it requires new target HAL implementation).
112+
New features target feature releases. A new feature can only be integrated if the feature supports most of the targets (if it requires new target HAL implementation).
112113

113114
We consider adding a new functionality to be a feature. It does not matter if it is C++, C or Python.
114115

@@ -160,23 +161,25 @@ Each state is time boxed. In most cases, this is sufficient time to move to anot
160161

161162
All pull requests must be reviewed. The Arm Mbed CI bot determines the most suitable person to review the pull request and tags that person accordingly.
162163

164+
Github dismisses a reviewer's status after any change to the pull request commit history (such as adding a new commit or rebasing). Smaller changes, such as documentation edits or rebases on top of latest master, only require additonal review by maintainers. Their approval is sufficient because a team assigned as a reviewer already approved the pull request.
165+
163166
Time: 3 days for reviewers to leave feedback after the maintainers add the "needs: review" label.
164167

165168
#### The CI (Continuous Integration) testing
166169

167-
There are many CI systems available. Which CI tests we run against a particular pull request depends on the effect that pull request has on the code base. Irrespective of which CIs tests run, Mbed OS has an all green policy, meaning that all the CI jobs that are triggered must pass before we merge the pull request.
170+
There are many CI systems available. Which CI tests we run against a particular pull request depends on the effect that pull request has on the code base. Irrespective of which CI tests run, Mbed OS has an all green policy, meaning that all the CI jobs that are triggered must pass before we merge the pull request.
168171

169172
Time: 1 day for CI to complete and report back results.
170173

171174
#### Work needed
172175

173-
A pull request in the work needed state requires additional work due to failed tests or rework as a result of the review. If a pull request is in this state, our maintainers request changes from the pull request author.
176+
A pull request in the work needed state requires additional work due to failed tests, or rework as a result of the review. If a pull request is in this state, then our maintainers request changes from the pull request author.
174177

175178
Time: 3 days for the pull request author to action the review comments.
176179

177180
#### Releases
178181

179-
When we merge a pull request that we will publish in a patch release, we tag the pull request with the specific patch release version. This is the release in which we first publish this pull request. For patch releases, we allow only bug fixes, new targets and enhancements to existing functionality. New features only go to feature releases.
182+
When we merge a pull request that we will publish in a patch release, we tag the pull request with the specific patch release version. This is the release in which we first publish this pull request. For patch releases, we allow only bug fixes, new targets and enhancements to existing functionality. New features only go in feature releases.
180183

181184
The release tag has the following format:
182185

0 commit comments

Comments
 (0)