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

add Makefile targets for fix-whitespace (backport #10376) #10438

Merged
merged 2 commits into from
Oct 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 8, 2024

make whitespace now runs fix-whitespace --check --verbose and make fix-whitespace runs fix-whitespace --verbose. You will need to install fix-whitespace yourself, but that's just a cabal install away.

This is another step in the direction of fixing #10263.

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:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

This is an automatic backport of pull request #10376 done by [Mergify](https://mergify.com).

`make whitespace` now runs `fix-whitespace --check --verbose` and
`make fix-whitespace` runs `fix-whitespace --verbose`.

(cherry picked from commit 2858dc0)

# Conflicts:
#	.github/workflows/whitespace.yml
@mergify mergify bot added the conflicts label Oct 8, 2024
Copy link
Contributor Author

mergify bot commented Oct 8, 2024

Cherry-pick of 2858dc0 has failed:

On branch mergify/bp/3.12/pr-10376
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit 2858dc099.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CONTRIBUTING.md
	modified:   Makefile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/whitespace.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Oct 8, 2024
2 tasks
@mergify mergify bot added the backport label Oct 8, 2024
@Kleidukos Kleidukos added merge me Tell Mergify Bot to merge merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days and removed conflicts labels Oct 8, 2024
@mergify mergify bot merged commit 01d22f7 into 3.12 Oct 8, 2024
48 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10376 branch October 8, 2024 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants