aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-10-14 09:31:20 +0000
committerGitHub <noreply@github.com>2021-10-14 09:31:20 +0000
commiteb29257b21954544919defc15afba5cd5bfdfaa7 (patch)
treea94a73550785728a196e9c538ebfc1be5de402ee
parente5a7ee485675419eaf4e47adf112a27f403cc1a0 (diff)
parent36088fa7df20dacc231d5b1492a593d82fd27739 (diff)
downloadgcc-eb29257b21954544919defc15afba5cd5bfdfaa7.zip
gcc-eb29257b21954544919defc15afba5cd5bfdfaa7.tar.gz
gcc-eb29257b21954544919defc15afba5cd5bfdfaa7.tar.bz2
Merge #730
730: GCC allows for the DCO sign-off r=philberty a=philberty This updates the contributor guide to let people know the update applies to gccrs. Co-authored-by: Philip Herron <philip.herron@embecosm.com> Co-authored-by: Thomas Schwinge <thomas@schwinge.name>
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md5
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--README.md2
3 files changed, 5 insertions, 4 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7bcb376..24f920b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,7 +8,7 @@ in the git commit message.
Here is a checklist to help you with your PR.
-- \[ ] GCC code require copyright assignment: https://gcc.gnu.org/contribute.html
+- \[ ] GCC development requires copyright assignment or the Developer's Certificate of Origin sign-off, see https://gcc.gnu.org/contribute.html or https://gcc.gnu.org/dco.html
- \[ ] Read contributing guidlines
- \[ ] `make check-rust` passes locally
- \[ ] Run `clang-format`
@@ -18,4 +18,5 @@ Note that you can skip the above if you are just opening a WIP PR in
order to get feedback.
---
-*Please write a short comment explaining your change.
+*Please write a comment explaining your change. This is the message
+that will be part of the merge commit.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3e36f16..360c0e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@
* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
-* Before submitting, GCCRS requires copyright assignment. Please read the [Contributing to GCC](https://gcc.gnu.org/contribute.html) guide to know more.
+* Before submitting, GCC development requires copyright assignment or the Developer's Certificate of Origin sign-off. Please see the [Contributing to GCC](https://gcc.gnu.org/contribute.html) guide or [Developer's Certificate of Origin (DCO) Sign-off](https://gcc.gnu.org/dco.html) guide.
* Patches sent to the [`gcc-rust` mailing list](https://gcc.gnu.org/mailman/listinfo/gcc-rust) are likewise welcome.
These will be imported into a GitHub PR to follow the normal review process, and the link to the GitHub PR sent to the submitter.
diff --git a/README.md b/README.md
index 1206386..c2c2741 100644
--- a/README.md
+++ b/README.md
@@ -193,7 +193,7 @@ To emit Rust front end debug output, you may add options like `-frust-debug`, `-
If you want to contribute to GCC Rust, you can find more information in [CONTRIBUTING.md](https://github.com/Rust-GCC/gccrs/blob/master/CONTRIBUTING.md).
Please be aware this project is designed to be pushed upstream to GCC when we reach some milestones, and this means we require
-contributions to have copyright assignment in place. Please see https://gcc.gnu.org/contribute.html.
+copyright assignment or the Developer's Certificate of Origin sign-off. Please see the [Contributing to GCC](https://gcc.gnu.org/contribute.html) guide or [Developer's Certificate of Origin (DCO) Sign-off](https://gcc.gnu.org/dco.html) guide.
Not all contributions must be code; we would love to see new test cases or bugs and issues to be reported. Feel free to add any comments on open PRs