Repository navigation
Forward-merge release/2.2 into develop - #342
Merged
Merged
Conversation
#### Overview Adds an explicit DCO sign-off field to the pull request template for repositories using the RAPIDS squash auto-merger. The auto-merger copies the PR description into the generated squash commit. Without a matching `Signed-off-by` trailer in that description, the generated release commit fails DCO when it is subsequently forward-merged into `develop`. The template directs contributors to use the commit identity configured by GitHub, including the GitHub-provided noreply address when email privacy is enabled. #### DCO sign-off for the squash commit Signed-off-by: Ajay Thorve <AjayThorve@users.noreply.github.com> #### Validation - [x] `git diff --check` - [x] `uv run pre-commit run --files .github/pull_request_template.md` - [x] Markdown link checking and secret detection passed. - [x] I confirmed this PR does not include secrets, credentials, or internal-only data. - [x] I certify this contribution under the Developer Certificate of Origin (DCO). #### Where should reviewers start? Review `.github/pull_request_template.md` and confirm that the sign-off instructions match the identity GitHub assigns to generated squash commits. #### Related Issues This is a process workaround for DCO failures on automated `release/2.2` to `develop` forward merges. ## Summary by CodeRabbit * **Documentation** * Updated the pull request template with instructions for DCO sign-off on squash commits. * Added a required sign-off placeholder and a checklist item to confirm it has been replaced. Authors: - Ajay Thorve (https://github.com/AjayThorve) Approvers: - Tanner Leach (https://github.com/tanleach) URL: #341
Author
|
FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Forward-merge triggered by push to release/2.2 that creates a PR to keep develop up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.