Skip to content

Commit a3bd218

Browse files
andreasabelandreasabel
committed
GHC-9.2: bump ubs base, optparse-applicative, http-client, time; add Haskell-CI
Also adding CI generated by Haskell-CI for ensuring build with all GHC versions advertised in `tested-with`.
1 parent 24872a9 commit a3bd218

File tree

11 files changed

+374
-28
lines changed

11 files changed

+374
-28
lines changed

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

Lines changed: 326 additions & 0 deletions
Large diffs are not rendered by default.

‎.github/workflows/haskell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
ghc: ['9.0.2', '8.10.7', '8.8.4', '8.6.5']
13+
ghc: ['9.2.1', '9.0.2', '8.10.7', '8.8.4', '8.6.5']
1414
os: [ubuntu-latest, macOS-latest, windows-latest]
1515
steps:
1616
- uses: actions/checkout@v2

‎cabal.haskell-ci‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
ghc-head: True
2-
osx: 8.4.4
32

43
constraint-set no-lukko
54
ghc: >=8.2

‎example-client/example-client.cabal‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ copyright: Copyright 2015 Well-Typed LLP
1010
category: Distribution
1111
build-type: Simple
1212
cabal-version: >=1.10
13-
tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
14-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
13+
14+
tested-with:
15+
GHC==9.2.1, GHC==9.0.2,
16+
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
17+
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
1518

1619
flag use-network-uri
1720
description: Are we using network-uri?
@@ -26,7 +29,7 @@ executable example-client
2629
main-is: Main.hs
2730
other-modules: Prelude ExampleClient.Options
2831

29-
build-depends: base >= 4.5 && < 4.16,
32+
build-depends: base >= 4.5 && < 4.17,
3033
bytestring >= 0.9,
3134
directory >= 1.1,
3235
filepath >= 1.2,

‎hackage-repo-tool/hackage-repo-tool.cabal‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ copyright: Copyright 2015 Well-Typed LLP
2121
category: Distribution
2222
homepage: https://github.com/haskell/hackage-security
2323
bug-reports: https://github.com/haskell/hackage-security/issues
24-
tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
25-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
24+
25+
tested-with:
26+
GHC==9.2.1, GHC==9.0.2,
27+
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
28+
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
2629

2730
extra-source-files:
2831
ChangeLog.md README.md
@@ -56,11 +59,11 @@ executable hackage-repo-tool
5659

5760
-- For boot libraries we try to accomodate the versions bundled with
5861
-- the respective GHC release
59-
build-depends: base >= 4.5 && < 4.16,
62+
build-depends: base >= 4.5 && < 4.17,
6063
bytestring >= 0.9 && < 0.12,
6164
directory >= 1.1 && < 1.4,
6265
filepath >= 1.3 && < 1.5,
63-
time >= 1.4 && < 1.10
66+
time >= 1.4 && < 1.13
6467
if !os(windows)
6568
build-depends: unix >= 2.5 && < 2.8
6669

@@ -73,7 +76,7 @@ executable hackage-repo-tool
7376
-- For non-boot libraries we try to support single major versions
7477
-- to reduce the risk of semantic differences
7578
build-depends: microlens >= 0.4.11.2 && < 0.5,
76-
optparse-applicative >= 0.15.1 && < 0.16,
79+
optparse-applicative >= 0.15.1 && < 0.18,
7780
tar >= 0.5 && < 0.6,
7881
zlib >= 0.6 && < 0.7,
7982
hackage-security >= 0.6 && < 0.7

‎hackage-root-tool/hackage-root-tool.cabal‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ copyright: Copyright 2015 Well-Typed LLP
1414
category: Distribution
1515
build-type: Simple
1616
cabal-version: >=1.10
17-
tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
18-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
17+
18+
tested-with:
19+
GHC==9.2.1, GHC==9.0.2,
20+
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
21+
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
1922

2023
extra-source-files:
2124
ChangeLog.md
@@ -29,7 +32,7 @@ executable hackage-root-tool
2932
main-is: Main.hs
3033
build-depends: base >= 4.4 && < 5,
3134
filepath >= 1.2 && < 1.5,
32-
optparse-applicative >= 0.11 && < 0.16,
35+
optparse-applicative >= 0.11 && < 0.18,
3336
hackage-security >= 0.5 && < 0.7
3437
default-language: Haskell2010
3538
other-extensions: CPP, ScopedTypeVariables, RecordWildCards

‎hackage-security-HTTP/hackage-security-HTTP.cabal‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ category: Distribution
1515
homepage: https://github.com/haskell/hackage-security
1616
bug-reports: https://github.com/haskell/hackage-security/issues
1717
build-type: Simple
18-
tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
19-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
18+
19+
tested-with:
20+
GHC==9.2.1, GHC==9.0.2,
21+
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
22+
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
2023

2124
extra-source-files:
2225
ChangeLog.md
@@ -31,7 +34,7 @@ flag use-network-uri
3134

3235
library
3336
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP
34-
build-depends: base >= 4.5 && < 4.16,
37+
build-depends: base >= 4.5 && < 4.17,
3538
bytestring >= 0.9 && < 0.12,
3639
HTTP >= 4000.2.19 && < 4000.4,
3740
mtl >= 2.1 && < 2.3,

‎hackage-security-curl/hackage-security-curl.cabal‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@ copyright: Copyright 2015 Well-Typed LLP
1414
category: Distribution
1515
build-type: Simple
1616
cabal-version: >=1.10
17-
tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
18-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
17+
18+
tested-with:
19+
GHC==9.2.1, GHC==9.0.2,
20+
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
21+
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
1922

2023
flag use-network-uri
2124
description: Are we using network-uri?
2225
manual: False
2326

2427
library
2528
exposed-modules: Hackage.Security.Client.Repository.HttpLib.Curl
26-
build-depends: base >= 4.5 && < 4.16,
29+
build-depends: base >= 4.5 && < 4.17,
2730
bytestring >= 0.9,
2831
process >= 1.1,
2932
hackage-security

‎hackage-security-http-client/hackage-security-http-client.cabal‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@ copyright: Copyright 2015 Well-Typed LLP
1313
category: Distribution
1414
build-type: Simple
1515
cabal-version: >=1.10
16-
tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
17-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
16+
17+
tested-with:
18+
GHC==9.2.1, GHC==9.0.2,
19+
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
20+
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
1821

1922
flag use-network-uri
2023
description: Are we using network-uri?
2124
manual: False
2225

2326
library
2427
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HttpClient
25-
build-depends: base >= 4.5 && < 4.16,
28+
build-depends: base >= 4.5 && < 4.17,
2629
bytestring >= 0.9,
27-
http-client >= 0.4 && < 0.7,
30+
http-client >= 0.4 && < 0.8,
2831
http-types >= 0.8,
2932
hackage-security >= 0.5 && < 0.7
3033
hs-source-dirs: src

‎hackage-security/hackage-security.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ category: Distribution
2929
homepage: https://github.com/haskell/hackage-security
3030
bug-reports: https://github.com/haskell/hackage-security/issues
3131
build-type: Simple
32+
3233
tested-with:
33-
GHC==9.0.2,
34+
GHC==9.2.1, GHC==9.0.2,
3435
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
3536
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
3637

37-
3838
extra-source-files:
3939
ChangeLog.md
4040

@@ -117,7 +117,7 @@ library
117117
Hackage.Security.Util.TypedEmbedded
118118
MyPrelude
119119
-- We support ghc 7.4 (bundled with Cabal 1.14) and up
120-
build-depends: base >= 4.5 && < 4.16,
120+
build-depends: base >= 4.5 && < 4.17,
121121
base16-bytestring >= 0.1.1 && < 1.1,
122122
base64-bytestring >= 1.0 && < 1.3,
123123
bytestring >= 0.9 && < 0.12,

0 commit comments

Comments
 (0)