From 535a824bf743274882f0f2d897c6768aaa91c109 Mon Sep 17 00:00:00 2001 From: Philip Herron Date: Wed, 13 Oct 2021 10:33:29 +0100 Subject: [PATCH 1/4] GCC allows for the DCO sign-off. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This updates the contributor guide to let people know the update applys to gccrs. Co-authored-by: CohenArthur Co-authored-by: Marc Poulhiès --- .github/PULL_REQUEST_TEMPLATE.md | 5 +++-- CONTRIBUTING.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7bcb376056df..d209ddbe7b91 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 the DCO or copyright assignment. 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 3e36f160e9d7..b7daf8b3fe60 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 read the [Contributing to GCC guide](https://gcc.gnu.org/contribute.html) or [DCO Guide](https://gcc.gnu.org/dco.html) guide to know more. * 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. From 8545a9392912e6c046d568258035282a025e030c Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 14 Oct 2021 10:32:55 +0200 Subject: [PATCH 2/4] Align DCO wording in '.github/PULL_REQUEST_TEMPLATE.md' ... to that used in 'CONTRIBUTING.md'. --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d209ddbe7b91..24f920bc9776 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 development requires the DCO or copyright assignment. See: https://gcc.gnu.org/contribute.html or https://gcc.gnu.org/dco.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` From 5d9d3e32df908de70e6b1e9e712e64e367e88753 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 14 Oct 2021 10:35:24 +0200 Subject: [PATCH 3/4] Some polishing of DCO wording . --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b7daf8b3fe60..360c0e224f94 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, GCC development requires copyright assignment or the Developer's Certificate of Origin sign-off. Please read the [Contributing to GCC guide](https://gcc.gnu.org/contribute.html) or [DCO Guide](https://gcc.gnu.org/dco.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. From 36088fa7df20dacc231d5b1492a593d82fd27739 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 14 Oct 2021 10:39:18 +0200 Subject: [PATCH 4/4] Update 'README.md' for DCO ... using the same wording as in 'CONTRIBUTING.md'. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1206386a1054..c2c274109e6e 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