Skip to content

Commit afcc383

Browse files
phadejphadej
authored
Merge pull request #730 from haskell-CI/move-postprocess
Postprocess the empty config as well
2 parents 28aae7d + ad64394 commit afcc383

22 files changed

+452
-602
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ jobs:
3030
strategy:
3131
matrix:
3232
include:
33+
- compiler: ghc-9.10.1
34+
compilerKind: ghc
35+
compilerVersion: 9.10.1
36+
setup-method: ghcup
37+
allow-failure: false
3338
- compiler: ghc-9.8.2
3439
compilerKind: ghc
3540
compilerVersion: 9.8.2
@@ -216,13 +221,15 @@ jobs:
216221
ghc-options: -Werror=missing-methods -Werror=missing-fields
217222
EOF
218223
cat >> cabal.project <<EOF
224+
allow-newer: ShellCheck:filepath
225+
219226
package haskell-ci
220227
ghc-options: -Werror
221228
222229
package cabal-install-parsers
223230
ghc-options: -Werror
224231
225-
keep-going: False
232+
keep-going: False
226233
227234
package bytestring
228235
tests: False

‎cabal-install-parsers/cabal-install-parsers.cabal‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 2.2
22
name: cabal-install-parsers
33
version: 0.6.2
4+
x-revision: 1
45
synopsis: Utilities to work with cabal-install files
56
description:
67
@cabal-install-parsers@ provides parsers for @cabal-install@ files:
@@ -33,6 +34,7 @@ tested-with:
3334
|| ==9.4.8
3435
|| ==9.6.5
3536
|| ==9.8.2
37+
|| ==9.10.1
3638

3739
extra-source-files:
3840
Changelog.md
@@ -65,14 +67,14 @@ library
6567

6668
-- GHC-boot libraries
6769
build-depends:
68-
, base >=4.12 && <4.20
70+
, base >=4.12 && <4.21
6971
, binary ^>=0.8.6.0
7072
, bytestring ^>=0.10.8.2 || ^>=0.11.1.0 || ^>=0.12.0.2
7173
, Cabal-syntax ^>=3.12.0.0
72-
, containers ^>=0.6.0.1
74+
, containers ^>=0.6.0.1 || ^>=0.7
7375
, deepseq ^>=1.4.2.0 || ^>=1.5.0.0
7476
, directory ^>=1.3.0.0
75-
, filepath ^>=1.4.1.1
77+
, filepath ^>=1.4.1.1 || ^>=1.5.2.0
7678
, parsec ^>=3.1.13.0
7779
, pretty ^>=1.1.3.3
7880
, text ^>=1.2.3.0 || ^>=2.0.1 || ^>=2.1
@@ -129,7 +131,7 @@ test-suite cabal-parsers-golden
129131

130132
-- dependencies needing explicit constraints
131133
build-depends:
132-
, ansi-terminal >=1.0 && <1.1
134+
, ansi-terminal >=1.0 && <1.2
133135
, tasty ^>=1.4 || ^>=1.5
134136
, tasty-golden ^>=2.3.1.1
135137
, tree-diff >=0.2 && <0.4

‎cabal-install-parsers/src/Cabal/Config.hs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE DeriveGeneric #-}
23
{-# LANGUAGE OverloadedStrings #-}
34
{-# LANGUAGE StandaloneDeriving #-}
@@ -22,7 +23,6 @@ import Control.Exception (throwIO)
2223
import Data.ByteString (ByteString)
2324
import Data.Function ((&))
2425
import Data.Functor.Identity (Identity (..))
25-
import Data.List (foldl')
2626
import Data.List.NonEmpty (NonEmpty)
2727
import Data.Map (Map)
2828
import Data.Maybe (fromMaybe)
@@ -33,6 +33,10 @@ import System.Directory (getAppUserDataDirectory)
3333
import System.Environment (lookupEnv)
3434
import System.FilePath ((</>))
3535

36+
#if !MIN_VERSION_base(4,20,0)
37+
import Data.Foldable (foldl')
38+
#endif
39+
3640
import qualified Data.ByteString as BS
3741
import qualified Data.Map.Strict as M
3842
import qualified Distribution.CabalSpecVersion as C

‎cabal-install-parsers/src/Cabal/Project.hs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE DeriveFoldable #-}
23
{-# LANGUAGE DeriveFunctor #-}
34
{-# LANGUAGE DeriveGeneric #-}
@@ -34,7 +35,7 @@ import Data.Either (partitionEithers)
3435
import Data.Foldable (toList)
3536
import Data.Function ((&))
3637
import Data.Functor (void)
37-
import Data.List (foldl', isSuffixOf)
38+
import Data.List (isSuffixOf)
3839
import Data.List.NonEmpty (NonEmpty)
3940
import Data.Maybe (mapMaybe)
4041
import Data.Traversable (for)
@@ -45,6 +46,10 @@ import Network.URI (URI (URI), parseURI)
4546
import System.Directory (doesDirectoryExist, doesFileExist)
4647
import System.FilePath (isAbsolute, normalise, splitDirectories, splitDrive, takeDirectory, (</>))
4748

49+
#if !MIN_VERSION_base(4,20,0)
50+
import Data.Foldable (foldl')
51+
#endif
52+
4853
import qualified Data.ByteString as BS
4954
import qualified Data.Map.Strict as M
5055
import qualified Distribution.CabalSpecVersion as C

‎cabal.project‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ tests: True
66
package haskell-ci
77
ghc-options: -Wall
88
ghc-options: -Werror
9+
10+
allow-newer: ShellCheck:filepath

‎fixtures/all-versions.github‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
- compiler: ghc-9.0.1
162162
compilerKind: ghc
163163
compilerVersion: 9.0.1
164-
setup-method: hvr-ppa
164+
setup-method: ghcup
165165
allow-failure: false
166166
- compiler: ghc-8.10.7
167167
compilerKind: ghc
@@ -181,107 +181,107 @@ jobs:
181181
- compiler: ghc-8.10.4
182182
compilerKind: ghc
183183
compilerVersion: 8.10.4
184-
setup-method: hvr-ppa
184+
setup-method: ghcup
185185
allow-failure: false
186186
- compiler: ghc-8.10.3
187187
compilerKind: ghc
188188
compilerVersion: 8.10.3
189-
setup-method: hvr-ppa
189+
setup-method: ghcup
190190
allow-failure: false
191191
- compiler: ghc-8.10.2
192192
compilerKind: ghc
193193
compilerVersion: 8.10.2
194-
setup-method: hvr-ppa
194+
setup-method: ghcup
195195
allow-failure: false
196196
- compiler: ghc-8.10.1
197197
compilerKind: ghc
198198
compilerVersion: 8.10.1
199-
setup-method: hvr-ppa
199+
setup-method: ghcup
200200
allow-failure: false
201201
- compiler: ghc-8.8.4
202202
compilerKind: ghc
203203
compilerVersion: 8.8.4
204-
setup-method: hvr-ppa
204+
setup-method: ghcup
205205
allow-failure: false
206206
- compiler: ghc-8.8.3
207207
compilerKind: ghc
208208
compilerVersion: 8.8.3
209-
setup-method: hvr-ppa
209+
setup-method: ghcup
210210
allow-failure: false
211211
- compiler: ghc-8.8.2
212212
compilerKind: ghc
213213
compilerVersion: 8.8.2
214-
setup-method: hvr-ppa
214+
setup-method: ghcup
215215
allow-failure: false
216216
- compiler: ghc-8.8.1
217217
compilerKind: ghc
218218
compilerVersion: 8.8.1
219-
setup-method: hvr-ppa
219+
setup-method: ghcup
220220
allow-failure: false
221221
- compiler: ghc-8.6.5
222222
compilerKind: ghc
223223
compilerVersion: 8.6.5
224-
setup-method: hvr-ppa
224+
setup-method: ghcup
225225
allow-failure: false
226226
- compiler: ghc-8.6.4
227227
compilerKind: ghc
228228
compilerVersion: 8.6.4
229-
setup-method: hvr-ppa
229+
setup-method: ghcup
230230
allow-failure: false
231231
- compiler: ghc-8.6.3
232232
compilerKind: ghc
233233
compilerVersion: 8.6.3
234-
setup-method: hvr-ppa
234+
setup-method: ghcup
235235
allow-failure: false
236236
- compiler: ghc-8.6.2
237237
compilerKind: ghc
238238
compilerVersion: 8.6.2
239-
setup-method: hvr-ppa
239+
setup-method: ghcup
240240
allow-failure: false
241241
- compiler: ghc-8.6.1
242242
compilerKind: ghc
243243
compilerVersion: 8.6.1
244-
setup-method: hvr-ppa
244+
setup-method: ghcup
245245
allow-failure: false
246246
- compiler: ghc-8.4.4
247247
compilerKind: ghc
248248
compilerVersion: 8.4.4
249-
setup-method: hvr-ppa
249+
setup-method: ghcup
250250
allow-failure: false
251251
- compiler: ghc-8.4.3
252252
compilerKind: ghc
253253
compilerVersion: 8.4.3
254-
setup-method: hvr-ppa
254+
setup-method: ghcup
255255
allow-failure: false
256256
- compiler: ghc-8.4.2
257257
compilerKind: ghc
258258
compilerVersion: 8.4.2
259-
setup-method: hvr-ppa
259+
setup-method: ghcup
260260
allow-failure: false
261261
- compiler: ghc-8.4.1
262262
compilerKind: ghc
263263
compilerVersion: 8.4.1
264-
setup-method: hvr-ppa
264+
setup-method: ghcup
265265
allow-failure: false
266266
- compiler: ghc-8.2.2
267267
compilerKind: ghc
268268
compilerVersion: 8.2.2
269-
setup-method: hvr-ppa
269+
setup-method: ghcup
270270
allow-failure: false
271271
- compiler: ghc-8.2.1
272272
compilerKind: ghc
273273
compilerVersion: 8.2.1
274-
setup-method: hvr-ppa
274+
setup-method: ghcup
275275
allow-failure: false
276276
- compiler: ghc-8.0.2
277277
compilerKind: ghc
278278
compilerVersion: 8.0.2
279-
setup-method: hvr-ppa
279+
setup-method: ghcup
280280
allow-failure: false
281281
- compiler: ghc-8.0.1
282282
compilerKind: ghc
283283
compilerVersion: 8.0.1
284-
setup-method: hvr-ppa
284+
setup-method: ghcup
285285
allow-failure: false
286286
fail-fast: false
287287
steps:
@@ -301,7 +301,7 @@ jobs:
301301
- name: apt
302302
run: |
303303
apt-get update
304-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
304+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
305305
if [ "${{ matrix.setup-method }}" = ghcup ]; then
306306
mkdir -p "$HOME/.ghcup/bin"
307307
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"

0 commit comments

Comments
 (0)