Skip to content

Commit 91dd2fb

Browse files
authored
Add DCO requirements and updated code of conduct (dapr#669)
Issue reference: dapr/docs#2039 Signed-off-by: Will <[email protected]>
1 parent 413a036 commit 91dd2fb

File tree

1 file changed

+48
-13
lines changed

1 file changed

+48
-13
lines changed

CONTRIBUTING.md

Lines changed: 48 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,13 @@
22

33
Thank you for your interest in Dapr!
44

5-
This project welcomes contributions and suggestions. Most contributions require you to
6-
agree to a Contributor License Agreement (CLA) declaring that you have the right to,
7-
and actually do, grant us the rights to use your contribution.
5+
This project welcomes contributions and suggestions. Most contributions require you to signoff on your commits via
6+
the Developer Certificate of Origin (DCO). When you submit a pull request, a DCO-bot will automatically determine
7+
whether you need to provide signoff for your commit. Please follow the instructions provided by DCO-bot, as pull
8+
requests cannot be merged until the author(s) have provided signoff to fulfill the DCO requirement.
9+
You may find more information on the DCO requirements [below](#developer-certificate-of-origin-signing-your-work).
810

9-
For details, visit https://cla.microsoft.com.
10-
11-
When you submit a pull request, a CLA-bot will automatically determine whether you need
12-
to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the
13-
instructions provided by the bot. You will only need to do this once across all repositories using our CLA.
14-
15-
This project has adopted the Microsoft Open Source Code of Conduct.
16-
For more information see the Code of Conduct FAQ
17-
or contact [email protected] with any additional questions or comments.
11+
This project has adopted the [Contributor Covenant Code of Conduct](https://github.com/dapr/community/blob/master/CODE-OF-CONDUCT.md).
1812

1913
Contributions come in many forms: submitting issues, writing code, participating in discussions and community calls.
2014

@@ -72,6 +66,47 @@ All contributions come through pull requests. To submit a proposed change, we re
7266

7367
A good way to communicate before investing too much time is to create a "Work-in-progress" PR and share it with your reviewers. The standard way of doing this is to add a "[WIP]" prefix in your PR's title and assign the **do-not-merge** label. This will let people looking at your PR know that it is not well baked yet.
7468

69+
### Developer Certificate of Origin: Signing your work
70+
71+
#### Every commit needs to be signed
72+
73+
The Developer Certificate of Origin (DCO) is a lightweight way for contributors to certify that they wrote or otherwise have the right to submit the code they are contributing to the project. Here is the full text of the [DCO](https://developercertificate.org/), reformatted for readability:
74+
```
75+
By making a contribution to this project, I certify that:
76+
77+
(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
78+
79+
(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
80+
81+
(c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
82+
83+
(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.
84+
```
85+
86+
Contributors sign-off that they adhere to these requirements by adding a `Signed-off-by` line to commit messages.
87+
88+
```
89+
This is my commit message
90+
91+
Signed-off-by: Random J Developer <[email protected]>
92+
```
93+
Git even has a `-s` command line option to append this automatically to your commit message:
94+
```
95+
$ git commit -s -m 'This is my commit message'
96+
```
97+
98+
Each Pull Request is checked whether or not commits in a Pull Request do contain a valid Signed-off-by line.
99+
100+
#### I didn't sign my commit, now what?!
101+
102+
No worries - You can easily replay your changes, sign them and force push them!
103+
104+
```
105+
git checkout <branch-name>
106+
git commit --amend --no-edit --signoff
107+
git push --force-with-lease <remote-name> <branch-name>
108+
```
109+
75110
### Use of Third-party code
76111

77112
- All third-party code must be placed in the `vendor/` folder.
@@ -87,4 +122,4 @@ A non-exclusive list of code that must be places in `vendor/`:
87122

88123
## Code of Conduct
89124

90-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
125+
This project has adopted the [Contributor Covenant Code of Conduct](https://github.com/dapr/community/blob/master/CODE-OF-CONDUCT.md)

0 commit comments

Comments
 (0)