Skip to content

Commit 2377900

Browse files
committed
Bump CI to 9.2.4 and some deps
1 parent 33d7807 commit 2377900

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.15.20220710
11+
# version: 0.15.20220822
1212
#
13-
# REGENDATA ("0.15.20220710",["github","hackage-server.cabal"])
13+
# REGENDATA ("0.15.20220822",["github","hackage-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -34,9 +34,9 @@ jobs:
3434
strategy:
3535
matrix:
3636
include:
37-
- compiler: ghc-9.2.3
37+
- compiler: ghc-9.2.4
3838
compilerKind: ghc
39-
compilerVersion: 9.2.3
39+
compilerVersion: 9.2.4
4040
setup-method: ghcup
4141
allow-failure: false
4242
- compiler: ghc-9.0.2
@@ -62,7 +62,7 @@ jobs:
6262
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
6363
if [ "${{ matrix.setup-method }}" = ghcup ]; then
6464
mkdir -p "$HOME/.ghcup/bin"
65-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
65+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
6666
chmod a+x "$HOME/.ghcup/bin/ghcup"
6767
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
6868
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -73,7 +73,7 @@ jobs:
7373
apt-get update
7474
apt-get install -y "$HCNAME" libbrotli-dev
7575
mkdir -p "$HOME/.ghcup/bin"
76-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
76+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
7777
chmod a+x "$HOME/.ghcup/bin/ghcup"
7878
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
7979
fi

cabal.haskell-ci

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@ installed: +all -Cabal -text -parsec
1313
-- Use Ubuntu 20.04
1414
distribution: focal
1515

16-
apt: libbrotli-dev
16+
apt: libbrotli-dev
17+
18+
-- Make sure the haddock step is included,
19+
-- even though we don't define any library.
20+
haddock-components: all
21+
-- since haskell-ci 0.15.20220822

hackage-server.cabal

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ copyright: 2008-2015 Duncan Coutts,
2727
license: BSD-3-Clause
2828
license-file: LICENSE
2929

30-
tested-with: GHC == { 9.2.3, 9.0.2, 8.10.7, 8.8.4 }
30+
tested-with: GHC == { 9.2.4, 9.0.2, 8.10.7, 8.8.4 }
3131

3232
data-dir: datafiles
3333
data-files:
@@ -111,12 +111,12 @@ common defaults
111111
, process >= 1.6 && < 1.7
112112
, text ^>= 1.2.5.0 || ^>= 2.0
113113
, time >= 1.9 && < 1.13
114-
, transformers >= 0.5 && < 0.6
115-
, unix >= 2.7 && < 2.8
114+
, transformers >= 0.5 && < 0.7
115+
, unix >= 2.7 && < 2.9
116116
, scientific
117117
-- other dependencies shared by most components
118118
build-depends:
119-
, aeson ^>= 2.0.3.0
119+
, aeson ^>= 2.0.3.0 || ^>= 2.1.0.0
120120
, Cabal ^>= 3.6.3.0
121121
, Cabal-syntax ^>= 3.6.0.0
122122
-- Cabal-syntax needs to be bound to constrain hackage-security
@@ -129,7 +129,7 @@ common defaults
129129
, parsec ^>= 3.1.13
130130
, tar ^>= 0.5
131131
, unordered-containers ^>= 0.2.10
132-
, vector ^>= 0.12
132+
, vector ^>= 0.12 || ^>= 0.13.0.0
133133
, zlib ^>= 0.6.2
134134

135135
ghc-options: -Wall -fwarn-tabs -fno-warn-unused-do-bind -fno-warn-deprecated-flags -funbox-strict-fields
@@ -377,7 +377,7 @@ library lib-server
377377
, async ^>= 2.2.1
378378
-- requires bumping http-io-streams
379379
, attoparsec ^>= 0.14.4
380-
, attoparsec-iso8601 ^>= 1.0
380+
, attoparsec-iso8601 ^>= 1.0 || ^>= 1.1.0.0
381381
, base16-bytestring ^>= 1.0
382382
-- requires bumping http-io-streams
383383
, base64-bytestring ^>= 1.2.1.0
@@ -401,15 +401,15 @@ library lib-server
401401
, haddock-library >= 1.7.0 && < 1.11
402402
-- haddock-library-1.11.0 changed type of markupOrderedList
403403
-- see https://github.com/haskell/hackage-server/issues/1128
404-
, happstack-server ^>= 7.7.1
405-
, hashable ^>= 1.3 || ^>= 1.4
404+
, happstack-server ^>= 7.7.1 || ^>= 7.8.0
405+
, hashable ^>= 1.3 || ^>= 1.4
406406
, hslogger ^>= 1.3.1
407407
, lifted-base ^>= 0.2.1
408408
, mime-mail ^>= 0.5
409409
, random ^>= 1.2
410410
, rss ^>= 3000.2.0.7
411411
, safecopy ^>= 0.10
412-
, semigroups ^>= 0.19
412+
, semigroups ^>= 0.20
413413
, split ^>= 0.2
414414
, stm ^>= 2.5.0
415415
, tagged ^>= 0.8.5

0 commit comments

Comments
 (0)