Skip to content

Conversation

@gr2m
Copy link
Contributor

@gr2m gr2m commented Nov 16, 2021


By default, Probot DCO enforces the presence of [valid DCO signoffs](#how-it-works) on all commits (excluding bots and merges). If a PRs contains commits that lack a valid Signed-off-by line, they are blocked until a correctly signed-off revision of the commit is pushed. This closely mirrors the upstream Linux kernel process.

### Individual remediation commit support
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add instructions on how to add remediation commits using git and the GitHub Web UI? I know you add instructions to the check runs which is great, but I think we should document it here as well, what do you think?

If I understand it correctly, ideally remediation commits would be empty commits with the correct messages, but there is no way to add empty commits using the GitHub Web UI as far as I know.

Comment on lines +35 to +37
allowRemediationCommits:
individual: true
thirdParty: true
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The thirdParty: true setting will set individual: true implicitly, setting both is no different to just setting thirdParty: true

https://github.com/brianwarner/dco/blob/eb53e5d32ce5d48b1467a581ed0ea404dc0a349c/index.js#L186

I think we should change the sitting from an object to a string enum

allowRemediationCommits: individual # or: thirdParty

Please let me know if you have any concerns about this change.

@gr2m gr2m force-pushed the remediation-commits branch from bcd5add to 796609d Compare November 16, 2021 06:28
@vercel
Copy link

vercel bot commented Nov 16, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/probot/dco/BvfnppNsb5exJpYj6ErnkYwJi9Rx
✅ Preview: https://dco-git-remediation-commits-probot.vercel.app

@gr2m
Copy link
Contributor Author

gr2m commented Nov 16, 2021

This branch is now deploying to Vercel for preview. You can install the GitHub app at https://github.com/apps/dco-staging

I tested it with the new remediation commit feature at gr2m/sandbox#217 and it worked

If you could thoroughly test the staging app that'd be great

@ryjones @brianwarner @ashleywolf

GitHub
GitHub is where people build software. More than 73 million people use GitHub to discover, fork, and contribute to over 200 million projects.

@ryjones
Copy link

ryjones commented Nov 16, 2021

Awesome. I've tested this on two repos in h-cicd - @brianwarner , would you like to test the larger attestation case, where a codebase has no previous sign-offs? could you point me to a repo to try it out on?

@brianwarner
Copy link
Contributor

brianwarner commented Nov 16, 2021 via email

@ryjones
Copy link

ryjones commented Nov 16, 2021

Thanks. I invited you two to be an admin on two repos:
Old Iroha which had signoff issues, and a test repo I made.

@gr2m
Copy link
Contributor Author

gr2m commented Nov 16, 2021

When you install the DCO staging, make sure DCO is not installed at the same time, the two will conflict with each other (overwrite each others checks).

@ryjones
Copy link

ryjones commented Nov 16, 2021

When you install the DCO staging, make sure DCO is not installed at the same time, the two will conflict with each other (overwrite each others checks).

yeah, I saw that :)

@gr2m
Copy link
Contributor Author

gr2m commented Nov 27, 2021

@ryjones @brianwarner did you have a chance to test these changues with https://github.com/apps/dco-staging?

GitHub
GitHub is where people build software. More than 73 million people use GitHub to discover, fork, and contribute to over 200 million projects.

@ryjones ryjones self-requested a review December 13, 2021 22:09
Copy link

@ryjones ryjones left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

brianwarner and others added 6 commits January 17, 2022 21:21
Signed-off-by: Brian Warner <brian@bdwarner.com>
Signed-off-by: Gregor Martynus <39992+gr2m@users.noreply.github.com>
Signed-off-by: Gregor Martynus <39992+gr2m@users.noreply.github.com>
Signed-off-by: Gregor Martynus <39992+gr2m@users.noreply.github.com>
@gr2m gr2m force-pushed the remediation-commits branch from bfa512d to d2fbe38 Compare January 18, 2022 05:24
@gr2m gr2m merged commit 1137575 into master Jan 18, 2022
@gr2m gr2m deleted the remediation-commits branch January 18, 2022 05:34
@github-actions
Copy link

🎉 This PR is included in version 1.0.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants