Fix maintainer readme syntax (#4226)

This commit is contained in:
Travis Plunk 2017-07-11 16:15:11 -07:00 committed by Dongbo Wang
parent 1a97af7e04
commit 7d50e5e5b0
2 changed files with 29 additions and 26 deletions

View file

@ -6,15 +6,16 @@ One of their primary responsibilities is merging pull requests after all require
They have [write access](https://help.github.com/articles/repository-permission-levels-for-an-organization/) to the PowerShell repositories which gives them the power to:
1. `git push` to the official PowerShell repository
2. Merge pull requests
3. Assign labels, milestones, and people to [issues](https://guides.github.com/features/issues/)
1. Merge pull requests
1. Assign labels, milestones, and people to [issues](https://guides.github.com/features/issues/)
## Table of Contents
- [Current Repository Maintainers](#current-repository-maintainers)
- [Repository Maintainer Responsibilities](#repository-maintainer-responsibilities)
- [Issue Management Process](#issue-management-process)
- [Pull Request Workflow](#pull-request-workflow)
- [Abandoned Pull Requests](#abandoned-pull-requests)
- [Abandoned Pull Requests](#abandoned-pull-requests)
- [Becoming a Repository Maintainer](#becoming-a-repository-maintainer)
## Current Repository Maintainers
@ -39,28 +40,28 @@ If you are a Repository Maintainer, you:
1. **MUST** validate that tests and documentation have been written before merging a pull request that contains new functionality
1. **SHOULD** add [the correct labels][issue-management] to issues and pull requests
1. **SHOULD** make sure the correct [Area Experts](../community/governance.md#area-experts) are assigned to relevant pull requests and issues.
This includes adding extra reviewers when it makes sense
(e.g. a pull request that adds remoting capabilities might require a security expert)
This includes adding extra reviewers when it makes sense
(e.g. a pull request that adds remoting capabilities might require a security expert)
1. **SHOULD** validate that the names and email addresses in the git commits reasonably match identity of the person submitting the pull request
1. **SHOULD** make sure contributors are following the [contributor guidelines][CONTRIBUTING]
1. **SHOULD** ask people to resend a pull request, if it [doesn't target `master`](../../.github/CONTRIBUTING.md#lifecycle-of-a-pull-request)
1. **SHOULD** wait for the [CI system][ci-system] build to pass for pull requests
(unless, for instance, the pull request is being submitted to fix broken CI)
(unless, for instance, the pull request is being submitted to fix broken CI)
1. **SHOULD** encourage contributors to refer to issues in their pull request description (e.g. `Resolves issue #123`).
If a user did not create an issue prior to submitting their pull request, their pull request should not be rejected.
However, they should be reminded to create an issue in the future to frontload any potential problems with the work and to minimize duplication of efforts.
If a user did not create an issue prior to submitting their pull request, their pull request should not be rejected.
However, they should be reminded to create an issue in the future to frontload any potential problems with the work and to minimize duplication of efforts.
1. **SHOULD** encourage contributors to create meaningful titles for all PRs.
Edit the title if necessary to provide clarity on the problem
Edit the title if necessary to provide clarity on the problem
1. **SHOULD** encourage contributes to write meaningful, descriptive git commits
1. **SHOULD NOT** merge pull requests with a failed CI build
(unless, for instance, the pull request is being submitted to fix broken CI)
(unless, for instance, the pull request is being submitted to fix broken CI)
1. **SHOULD NOT** merge pull requests without the label `cla-signed` or `cla-not-required` from the Microsoft CLA bot
(unless the CLA bot is broken, and CLA signing can be confirmed through other means)
(unless the CLA bot is broken, and CLA signing can be confirmed through other means)
1. **SHOULD NOT** merge pull requests too quickly after they're submitted.
Even if the pull request meets all the requirements, people should have time to give their input
(unless the pull request is particularly urgent for some reason)
Even if the pull request meets all the requirements, people should have time to give their input
(unless the pull request is particularly urgent for some reason)
1. **SHOULD NOT** merge your own pull requests.
If a Repository Maintainer opens a pull request, another Maintainer should merge it unless there are extreme, short-term circumstances requiring a merge or another Maintainer has given explicit sign-off without merging
If a Repository Maintainer opens a pull request, another Maintainer should merge it unless there are extreme, short-term circumstances requiring a merge or another Maintainer has given explicit sign-off without merging
## Issue Management Process
@ -70,15 +71,15 @@ Please see [Issue Management][issue-management]
1. A contributor opens a pull request.
1. The contributor ensures that their pull request passes the [CI system][ci-system] build.
- If the build fails, a maintainer adds the ```waiting for author``` label to the pull request.
The contributor can then continue to update the pull request until the build passes.
- If the build fails, a maintainer adds the ```waiting for author``` label to the pull request.
The contributor can then continue to update the pull request until the build passes.
1. Once the build passes, the maintainer either reviews the pull request immediately or adds the ```need review``` label.
1. A maintainer or trusted contributor reviews the pull request code.
- If the contributor does not meet the reviewer's standards, the reviewer makes comments.
A maintainer then removes the ```need review``` label and adds the ```waiting for author``` label.
The contributor must address the comments and repeat from step 2.
- If the contributor meets the reviewer's standards, the reviewer comments that they are satisfied.
A maintainer then removes the ```need review``` label.
- If the contributor does not meet the reviewer's standards, the reviewer makes comments.
A maintainer then removes the ```need review``` label and adds the ```waiting for author``` label.
The contributor must address the comments and repeat from step 2.
- If the contributor meets the reviewer's standards, the reviewer comments that they are satisfied.
A maintainer then removes the ```need review``` label.
1. Once the code review is completed, a maintainer merges the pull request.
### Abandoned Pull Requests
@ -88,11 +89,12 @@ A pull request with the label ```waiting for the author``` for **more than two w
In these cases:
1. Ping the author of PR to remind him of pending changes.
- If the contributor responds, it's no longer an abandoned pull request, proceed as normal.
2. If the contributor does not respond **within a week**:
- Create a new branch with the changes and open an issue to merge the code into the dev branch.
Mention the original pull request ID in the description of the new issue and close the abandoned pull request.
- If the changes in an abandoned pull request are no longer needed (e.g. due to refactoring of the code base or a design change), simply close the pull request.
- If the contributor responds, it's no longer an abandoned pull request, proceed as normal.
1. If the contributor does not respond **within a week**:
- Create a new branch with the changes and open an issue to merge the code into the dev branch.
Mention the original pull request ID in the description of the new issue and close the abandoned pull request.
- If the changes in an abandoned pull request are no longer needed (e.g. due to refactoring of
the code base or a design change), simply close the pull request.
## Becoming a Repository Maintainer

View file

@ -75,6 +75,7 @@ Describe 'Common Tests - Validate Markdown Files' -Tag 'CI' {
'./*.md'
'./docs/*.md'
'./docs/installation/*.md'
'./docs/maintainers/README.md'
'./demos/SSHRemoting/*.md'
'./docker/*.md'
)