Skip to content

Comments

Cnf over conf#11176

Closed
richsalz wants to merge 2 commits intoopenssl:masterfrom
richsalz:cnf-over-conf
Closed

Cnf over conf#11176
richsalz wants to merge 2 commits intoopenssl:masterfrom
richsalz:cnf-over-conf

Conversation

@richsalz
Copy link
Contributor

I know foo.conf is what we seem to prefer. But foo.cnf is what the docs talk about, and openssl.cnf is the default. I think it's less confusing to use .cnf as the extension for OpenSSL config files, so do the big renaming.

@levitte
Copy link
Member

levitte commented Feb 25, 2020

It's a bit interesting to see how we struggle with these sort of things. After unabbreviating lcl -> locl -> local, we now go the other way in another part.

In my view, cnf vs conf is like htm vs html.

@richsalz richsalz mentioned this pull request Feb 28, 2020
@t8m
Copy link
Member

t8m commented Feb 28, 2020

There are conflicts, please rebase.

@richsalz
Copy link
Contributor Author

pesky makdown :) rebased and pushed.

The default is openssl.cnf  The project seems to prefer xxx.conf these
days, but we should use the default convention.

Rename all foo.conf (except for Configurations) to foo.cnf

Fixes #11174
Copy link
Member

@InfoHunter InfoHunter left a comment

Choose a reason for hiding this comment

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

It seems there is a consensus made in #11174 , so I think this could be approved.

Copy link
Member

@t8m t8m left a comment

Choose a reason for hiding this comment

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

LGTM

@t8m t8m added approval: done This pull request has the required number of approvals branch: master Applies to master branch labels Mar 3, 2020
@mspncp
Copy link
Contributor

mspncp commented Mar 3, 2020

It's a bit interesting to see how we struggle with these sort of things. After unabbreviating lcl -> locl -> local, we now go the other way in another part.

In my view, cnf vs conf is like htm vs html.

FWIW: If it weren't for openssl.cnf, I would have preferred the longer file extension. But in this case it makes sense to go for the "more popular" file extension.

@richsalz
Copy link
Contributor Author

richsalz commented Mar 6, 2020

Don't know why the "ready to merge" robot didn't catch this, @iamamoose but this seems like 24 hours are done.

@mspncp
Copy link
Contributor

mspncp commented Mar 6, 2020

Don't know why the "ready to merge" robot didn't catch this, @iamamoose but this seems like 24 hours are done.

IIUC, the bot refrains from setting the "ready to merge" state if someone posts additional comments after the approval. In this case it was probably my post which prevent it. The rationale behind it is that a comment after final approval might be an indication of an ongoing discussion.

@t8m t8m added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Mar 6, 2020
openssl-machine pushed a commit that referenced this pull request Mar 6, 2020
Reviewed-by: Paul Yang <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #11176)
openssl-machine pushed a commit that referenced this pull request Mar 6, 2020
The default is openssl.cnf  The project seems to prefer xxx.conf these
days, but we should use the default convention.

Rename all foo.conf (except for Configurations) to foo.cnf

Fixes #11174

Reviewed-by: Paul Yang <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #11176)
@t8m
Copy link
Member

t8m commented Mar 6, 2020

Pushed to master.

@t8m t8m closed this Mar 6, 2020
@richsalz richsalz deleted the cnf-over-conf branch March 6, 2020 17:37
@richsalz
Copy link
Contributor Author

richsalz commented Mar 6, 2020

Thanks for the discusion and review!

@iamamoose
Copy link
Member

IIUC, the bot refrains from setting the "ready to merge" state if someone posts additional comments after the approval. In this case it was probably my post which prevent it. The rationale behind it is that a comment after final approval might be an indication of an ongoing discussion.

Exactly that. I don't want it to start second guessing or being too clever -- if there's any change to a PR since the Done label was set (such as a comment), then it assumes it needs a human decision.

@richsalz
Copy link
Contributor Author

richsalz commented Mar 6, 2020

"resolved - working as designed" :) makes sense to me, just thought it was worth asking.

@mspncp
Copy link
Contributor

mspncp commented Mar 6, 2020

But OTOH we loose the comfort of being reminded. Let's assume @iamamoose that you change the bot to neglect commits after 'review done', then we still would have two options to prevent the automatism:

  • Resetting the label from 'review done' to '* review pending' before the bot triggers
  • Resetting the label from 'ready to merge' to a previous state after the bot triggers

Maybe that alternative would be more convenient?

@richsalz
Copy link
Contributor Author

richsalz commented Mar 7, 2020

Another possibility is to just change the message to "This appears to be ready to merge (the hold period has expired)"

@mspncp
Copy link
Contributor

mspncp commented Mar 8, 2020

I like that suggestion, but I would drop the part in the parentheses:

This pull request appears to be ready to merge

@iamamoose what do you think about ignoring additional posts and triggering the timeout unconditionally, with a slightly modified (weaker) message?

@iamamoose
Copy link
Member

iamamoose commented Mar 9, 2020

I'm not a fan of labels that can mean two things; it could mean "this is ready do merge" or "this is probably ready to merge once you've read all the recent changes and they're harmless".

Two possibilities for "if there were changes made since the approval:done flag was set":

  1. We could create a new label "ready to merge after review" and have the bot move those things to that label

  2. It could add a comment "24 hours has now elapsed since Approval:Done but since there were changes made it has not been automatically moved to Approval:Ready to Merge" and not do anything with labels. That would help ping people (and stop them having to look to see if 24 hours is up) who could then manually set the label (or not if the comments required action first).

I went ahead and did #2 for now. It also does similar when CI is failed.

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

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants