Skip to content

Commit 46e8221

Browse files
authored
Merge pull request #9804 from cabalism/script/eol-eof-conformance
Text file, newlines at end of files
2 parents ef3b64c + eb87ffd commit 46e8221

File tree

71 files changed

+104
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+104
-85
lines changed

.github/workflows/bootstrap.skip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Bootstrap Skip
66
# to the docs, since these jobs take a long time to complete without providing any benefit.
77
# We therefore use path-filtering in the workflow triggers for the bootstrap jobs, namely
88
# "paths-ignore: doc/**". But the "Bootstrap post job" is a required job, therefore a PR cannot
9-
# be merged unless the "Bootstrap post job" completes succesfully, which it doesn't do if we
9+
# be merged unless the "Bootstrap post job" completes succesfully, which it doesn't do if we
1010
# filter it out.
1111
#
1212
# The solution: We use a second job with the same name which always returns the exit code 0.

.github/workflows/validate.skip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Validate Skip
66
# to the docs, since these jobs take a long time to complete without providing any benefit.
77
# We therefore use path-filtering in the workflow triggers for the validate jobs, namely
88
# "paths-ignore: doc/**". But the "Validate post job" is a required job, therefore a PR cannot
9-
# be merged unless the "Validate post job" completes succesfully, which it doesn't do if we
9+
# be merged unless the "Validate post job" completes succesfully, which it doesn't do if we
1010
# filter it out.
1111
#
1212
# The solution: We use a second job with the same name which always returns the exit code 0.

.github/workflows/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ jobs:
285285
run: sh validate.sh ${{ env.COMMON_FLAGS }} --lib-only -s lib-suite-extras --extra-hc ${{ env.EXTRA_GHC }}
286286

287287
build-alpine:
288-
name: Build statically linked using alpine
288+
name: Build statically linked using alpine
289289
runs-on: "ubuntu-latest"
290290
container: "alpine:3.19"
291291
steps:

.github/workflows/whitespace.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Whitespace
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: ["master"]
7+
8+
jobs:
9+
whitespace:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: andreasabel/fix-whitespace-action@v1

CONTRIBUTING.md

Lines changed: 7 additions & 2 deletions

Cabal-described/src/Distribution/Described.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,4 +591,4 @@ instance Described CompatLicenseFile where
591591
describe _ = describe ([] :: [Token])
592592

593593
instance Described CompatFilePath where
594-
describe _ = describe ([] :: [Token])
594+
describe _ = describe ([] :: [Token])

Cabal-described/src/Distribution/Utils/CharSet.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,4 @@ upper = foldl' (flip insert) empty [ c | c <- [ minBound .. maxBound ], isUpper
244244
-- $setup
245245
-- Use -XOverloadedStrings to avoid the error: Couldn't match type ‘[Char]’ with ‘CharSet’
246246
-- >>> :set -XOverloadedStrings
247-
-- >>> import Prelude (length)
247+
-- >>> import Prelude (length)

Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ tests = testGroup "Distribution.Simple.Program.GHC"
5353
, compilerCompat = []
5454
, compilerLanguages = []
5555
, compilerExtensions = []
56-
, compilerProperties = Map.singleton "Support parallel --make" "YES"
56+
, compilerProperties = Map.singleton "Support parallel --make" "YES"
5757
})
5858
(Platform X86_64 Linux)
5959
(mempty { ghcOptNumJobs = Flag (NumJobs (Just 4)) })
6060
assertListEquals flags ["-j4", "-clear-package-db"]
61-
]
61+
]
6262
]
6363

6464
assertListEquals :: (Eq a, Show a) => [a] -> [a] -> Assertion
@@ -190,4 +190,4 @@ options_9_0_all =
190190
options_9_0_affects :: [String]
191191
options_9_0_affects =
192192
[ "-fcmm-static-pred"
193-
]
193+
]

README.md

Lines changed: 2 additions & 2 deletions

bootstrap/src/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ main2 meta plan = do
113113
case P.uPkgSrc unit of
114114
Just (P.RepoTarballPackage (P.RepoSecure _uri)) ->
115115
return Hackage
116-
Just (P.LocalUnpackedPackage _path) ->
116+
Just (P.LocalUnpackedPackage _path) ->
117117
return Local
118118
pkgsrc ->
119119
die $ "package source not supported: " ++ show pkgsrc

0 commit comments

Comments
 (0)