-
Notifications
You must be signed in to change notification settings - Fork 698
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
Text file, newlines at end of files (backport #9804) #10007
Conversation
(cherry picked from commit 265f149)
(cherry picked from commit 7c9346b)
(cherry picked from commit c31ca12) # Conflicts: # .github/workflows/validate.yml
(cherry picked from commit 2ea012e)
(cherry picked from commit e420bf2)
- Fix whitespace in cabal-testsuite + other tests (cherry picked from commit e386a13)
(cherry picked from commit b790751)
Needed for POSIX compliance for text files (cherry picked from commit ed4c36a)
(cherry picked from commit 38eb1e8)
(cherry picked from commit b414faf)
Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com> (cherry picked from commit 834e1ed)
(cherry picked from commit eb87ffd)
Cherry-pick of c31ca12 has failed:
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 |
bullshit failure from fix-whitespace:
|
@philderbeast we tried to backport you #9804 to the 3.12 branch but it failed on the whitespace action, as mentioned above:
Here's the failing workflow: https://github.com/haskell/cabal/actions/runs/9065601825/job/24906767545 Do you have any idea why it's fine on |
@ulysses4ever do you know how I can checkout this branch locally? I tried;
|
Thanks for restoring the branch @ulysses4ever. |
There are two choices, either exclude those two files with violations (in $ git diff
diff --git a/license-list-data/exceptions-3.23.json b/license-list-data/exceptions-3.23.json
index 774f2632e..e2ad72824 100644
--- a/license-list-data/exceptions-3.23.json
+++ b/license-list-data/exceptions-3.23.json
@@ -769,4 +769,4 @@
}
],
"releaseDate": "2024-02-08"
-}
+}
\ No newline at end of file
diff --git a/license-list-data/licenses-3.23.json b/license-list-data/licenses-3.23.json
index ab676e4ef..884a5e62d 100644
--- a/license-list-data/licenses-3.23.json
+++ b/license-list-data/licenses-3.23.json
@@ -7994,4 +7994,4 @@
}
],
"releaseDate": "2024-02-08"
-}
+}
\ No newline at end of file |
Yes, thank you, I am accepting these in #10008. I wined a little about it here: #9818 (comment) |
Fixes #9802 for
*.hs
and*.project
filesand adds a script taking a file glob pattern for doing this, adding newlines at the ends of files where needed. Adds back the whitespace github workflow and usesfix-whitespace
to fix non-conformance. Add a short note about this in the contributing readme.This is an automatic backport of pull request #9804 done by [Mergify](https://mergify.com).