Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nonspec: Make requirements for draft reviews more explicit #1201

Merged
merged 3 commits into from
Oct 24, 2024

Conversation

TomHennen
Copy link
Contributor

Currently CONTRIBUTING.md says that PRs that affect draft files have 'relaxed' approval requirements but does not specify what those relaxed requirements are.

This PR makes the default requirements for draft PRs explicit (only 1 reviewer, no waiting period) in an attempt to speed progress on draft changes. Approving reviewers will have the opportunity to indicate if they want additional reviewers prior to submitting these draft PRs.

We will still have strict requirements (3 approvers, 72h waiting period) when moving content from draft to rc or final status. This should allow thorough review of changes in their finished state without hampering progress on new tracks.

Currently CONTRIBUTING.md says that PRs that affect draft
files have 'relaxed' approval requirements but does not
specify what those relaxed requirements are.

This PR makes the default requirements for draft PRs explicit
(only 1 reviewer, no waiting period) in an attempt to speed
progress on draft changes. Approving reviewers will have
the opportunity to indicate if they want additional reviewers
prior to submitting these draft PRs.

We will still have strict requirements (3 approvers, 72h
waiting period) when moving content from draft to rc or
final status. This should allow thorough review of changes
in their finished state without hampering progress on new
tracks.

Signed-off-by: Tom Hennen <tomhennen@google.com>
Copy link

netlify bot commented Oct 16, 2024

Deploy Preview for slsa ready!

Name Link
🔨 Latest commit cb865c6
🔍 Latest deploy log https://app.netlify.com/sites/slsa/deploys/67165b46b2a07300087043bb
😎 Deploy Preview https://deploy-preview-1201--slsa.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@trishankatdatadog
Copy link
Member

No strong opinions. I can see where this PR is coming from, but maybe two instead of three? This is so that the big reviews later going from draft to stable is not too surprising, but two would still be slower than one.

@TomHennen
Copy link
Contributor Author

No strong opinions. I can see where this PR is coming from, but maybe two instead of three? This is so that the big reviews later going from draft to stable is not too surprising, but two would still be slower than one.

Yeah that's definitely the tradeoff. I'd hope that the first approver could recognize situations like that that may require additional guidance and indicate it? It think that's generally the guidance at the moment. "up to Maintainer discretion" isn't quite specific enough about who that maintainer is. Should the PR author be allowed to make this distinction? That might also help with the goal without being as prescriptive.

E.g. We could say "up to Maintainer's discretion (including the PR author if they're a maintainer)"

Then the author could decide if they want to take the 'risk' of merging something that might generate a lot more feedback later.

Copy link
Member

@mlieberman85 mlieberman85 left a comment

Choose a reason for hiding this comment

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

I think this is a good start. We can iterate if we need to change some of the details

@trishankatdatadog
Copy link
Member

E.g. We could say "up to Maintainer's discretion (including the PR author if they're a maintainer)"

Yes, pls, thx!

Signed-off-by: Tom Hennen <tomhennen@google.com>
@TomHennen
Copy link
Contributor Author

E.g. We could say "up to Maintainer's discretion (including the PR author if they're a maintainer)"

Yes, pls, thx!

Done!

Copy link
Contributor

@marcelamelara marcelamelara left a comment

Choose a reason for hiding this comment

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

Thanks @TomHennen ! I'm sure we'll run into some special cases, but this seems like it covers the most general ones.

@lehors
Copy link
Member

lehors commented Oct 16, 2024

For what it's worth, I read the original text as meaning that for Drafts there are no requirements per se and "up to Maintainer discretion", in which case there is no need to define the requirements any further. But I'm happy with the suggested change.

@TomHennen
Copy link
Contributor Author

For what it's worth, I read the original text as meaning that for Drafts there are no requirements per se and "up to Maintainer discretion", in which case there is no need to define the requirements any further. But I'm happy with the suggested change.

hah! I'd been reading it as somewhat more restrictive, like I (as the PR author) would need to get explicit agreement with other Maintainer's to submit without all the documented approvals.

Copy link
Member

@MarkLodato MarkLodato left a comment

Choose a reason for hiding this comment

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

Is it also a requirement to have the "draft:" in the PR description, like you've been doing lately? Is that checked automatically? (That tag is helpful.)

@TomHennen
Copy link
Contributor Author

Is it also a requirement to have the "draft:" in the PR description, like you've been doing lately? Is that checked automatically? (That tag is helpful.)

It isn't checked automatically. I could add that 'draft' tag as a requirement. Not sure how to check it automatically though. Would we want just 'draft:' or like I've been doing "[whatever]: draft: [description]"

Copy link
Member

@arewm arewm left a comment

Choose a reason for hiding this comment

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

Are there any requirements that would be imposed if we added draft as an option here? https://github.com/slsa-framework/slsa/blob/main/.github/workflows/conventional-commits.yml#L22-L29

Do we have any process documented for moving content out of draft to ensure that appropriate reviews are given?

Signed-off-by: Tom Hennen <tomhennen@google.com>
@TomHennen
Copy link
Contributor Author

Are there any requirements that would be imposed if we added draft as an option here? https://github.com/slsa-framework/slsa/blob/main/.github/workflows/conventional-commits.yml#L22-L29

I think that just checks that the right prefix was added but doesn't do anything else AFAIK. Maybe someone else does?

Do we have any process documented for moving content out of draft to ensure that appropriate reviews are given?

We do! It's discussed here.

@TomHennen
Copy link
Contributor Author

Ok, I think we have enough approvals and waited long enough, so I'm going to merge. Thanks all!

@TomHennen TomHennen merged commit 4f0230b into slsa-framework:main Oct 24, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

8 participants