-
Notifications
You must be signed in to change notification settings - Fork 1
Migration: update the docs #20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
amarts
wants to merge
1
commit into
gmaster
Choose a base branch
from
migration_v1
base: gmaster
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| # GlusterFS project Contribution guidelines | ||
|
|
||
| ## Development Workflow | ||
|
|
||
| We follow most of the details as per the [document here](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests). If you are not aware of the github workflow, it is recommended to go through them before continuing here. | ||
|
|
||
| 0. Fork Repository | ||
| - Fork [GlusterFS repository](https://github.com/gluster/glusterfs/fork). | ||
|
|
||
| 1. Clone Repository | ||
| - Clone the glusterfs repo freshly from github using below steps. | ||
|
|
||
| ``` | ||
| git clone git@github.com:${username}/glusterfs.git | ||
| cd glusterfs/ | ||
| git remote add upstream git@github.com:gluster/glusterfs.git | ||
| ``` | ||
|
|
||
| 2. Commit Message / PR description: | ||
| - The name of the branch on your personal fork can start with issueNNNN, followed by anything of your choice. | ||
| - PRs continue to have the title of format "component: \<title\>", like it is practiced now. | ||
| - When you open a PR, having a reference Issue for the commit is mandatory in GlusterFS. | ||
| - Commit message can have, either `Fixes: #NNNN` or `Updates: #NNNN` in a separate line in the commit message. | ||
| - Here, NNNN is the Issue ID in glusterfs repository. | ||
| - Each commit needs the author to have the "Signed-off-by: Name \<email\>" line. | ||
| - Can do this by `-s` option for `git commit`. | ||
| - If the PR is not ready for review, apply the label `work-in-progress`. | ||
| - Check the availability of "Draft PR" is present for you, if yes, use that instead. | ||
|
|
||
| 3. Tests: | ||
| - All the required smoke tests would be auto-triggered. | ||
| - The "regression" tests would be triggered by a comment **"/ok-to-test"** from anyone in the [@gluster-all](https://github.com/orgs/gluster/teams/gluster-all) group. | ||
|
|
||
| 4. Review Process: | ||
| - `+2` : is equivalent to "Approve" from the people in the maintainer's group. | ||
| - `+1` : can be given by a maintainer/reviewer by explicitly stating that in the comment. | ||
| - `-1` : provide details on required changes and pick "Request Changes" while submitting your review. | ||
| - `-2` : done by adding the `DO-NOT-MERGE` label. | ||
|
|
||
| - Any further discussions can happen as comments in the PR. | ||
|
|
||
| 5. Making changes: | ||
| - There are 2 approaches to submit changes done after addressing review comments. | ||
| - Commit changes as a new commit on top of the original commits in the branch, and push the changes to same branch (issueNNNN) | ||
| - Commit changes into the same commit with `--amend` option, and do a push to the same branch with `--force` option. | ||
|
|
||
| 6. Merging: | ||
| - GlusterFS project follows 'Squash and Merge' method | ||
| - This is mainly to preserve the historic Gerrit method of one patch in `git log` for one URL link. | ||
| - This also makes every merge a complete patch, which has passed all tests. | ||
| - The merging of the patch is expected to be done by the maintainers. | ||
| - It can be done when all the tests (smoke and regression) pass. | ||
| - When the PR has 'Approved' flag from corresponding maintainer. | ||
| - If you feel there is delay, feel free to add a comment, discuss the same in Slack channel, or send email. | ||
|
|
||
| ## By contributing to this project, the contributor would need to agree to below. | ||
|
|
||
| ### Developer's Certificate of Origin 1.1 | ||
|
|
||
| By making a contribution to this project, I certify that: | ||
|
|
||
| (a) The contribution was created in whole or in part by me and I | ||
| have the right to submit it under the open source license | ||
| indicated in the file; or | ||
|
|
||
| (b) The contribution is based upon previous work that, to the best | ||
| of my knowledge, is covered under an appropriate open source | ||
| license and I have the right under that license to submit that | ||
| work with modifications, whether created in whole or in part | ||
| by me, under the same open source license (unless I am | ||
| permitted to submit under a different license), as indicated | ||
| in the file; or | ||
|
|
||
| (c) The contribution was provided directly to me by some other | ||
| person who certified (a), (b) or (c) and I have not modified | ||
| it. | ||
|
|
||
| (d) I understand and agree that this project and the contribution | ||
| are public and that a record of the contribution (including all | ||
| personal information I submit with it, including my sign-off) is | ||
| maintained indefinitely and may be redistributed consistent with | ||
| this project or the open source license(s) involved. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge type is "Squash and Merge"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Only that is permitted. Will update the document
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done