-
Notifications
You must be signed in to change notification settings - Fork 701
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
make formatting of build-depends
consistent
#10714
make formatting of build-depends
consistent
#10714
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems fine to me. Maybe a candidate to .git-blame-ignore-revs?..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
@ulysses4ever can this be merged? |
I added the |
@ffaf1 , incidentally, can manual merge be disabled? How can we configure this repo so only the Bot can merge? |
@ffaf1 , a second question, if you squash this PR and change the commit hash, that will break |
Indeed, well spotted. I set it back to
Good question, I don't have an answer. I will ask in Matrix. |
This was a reply I got, and I agree with it.
an more:
|
Thanks for raising the issue about the merge button @peterbecich ! I'll try to raise this issue at the upcoming Cabal meeting (this Thursday, the 16th). I think it makes sense to restrict it to admins only. |
5c53f49
to
fddf792
Compare
It is an automated bot action, let me see if I can block the merge queue… Or we will just put the correct hash after the fact. |
Maybe this is a rare case where manual merging is in order so that Mergify does not rebase and so invalidate the hashes. If so, @peterbecich, please feel free to use the button after rebasing manually and updating the commit with the hashes one last time. |
This pull request has been removed from the queue for the following reason: Pull request #10714 has been dequeued. The pull request rule doesn't match anymore. The following conditions don't match anymore:
You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it. If you want to requeue this pull request, you need to post a comment with the text: |
One merge option that fits this case is the "merge+no rebase" label, I believe. In that case Mergify won't touch the original commits. Of course, it's too little too late because the commits have been updated, so someone needs to update the SHA in the text file, and then put the "merge+no rebase" label... |
fddf792
to
72f37fd
Compare
`*.cabal` files in this project presently have a mix of formatting of `build-depends`. Make them all consistent with: https://cabal.readthedocs.io/en/3.4/cabal-package.html No changes to any dependencies.
72f37fd
to
add05c4
Compare
*.cabal
files in this project presently have a mix of formatting ofbuild-depends
.Make them all consistent with:
https://cabal.readthedocs.io/en/3.4/cabal-package.html
There are no changes to any dependencies.
Please read Github PR Conventions and then fill in one of these two templates.
Template B: This PR does not modify behaviour or interface
E.g. the PR only touches documentation or tests, does refactorings, etc.
Include the following checklist in your PR: