Skip to content

Commit 4ce6377

Browse files
andreasabelandreasabel
committed
Bump dependencies and CI for GHC 9.8.1
Building with GHC 9.8.1 blocked on: - [ ] happstack-server: Happstack/happstack-server#80
1 parent 458fb77 commit 4ce6377

File tree

4 files changed

+32
-27
lines changed

4 files changed

+32
-27
lines changed

‎.github/workflows/cabal.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@ on:
22
push:
33
branches:
44
- master
5-
- ci*
65
pull_request:
76
branches:
87
- master
9-
- ci*
108
name: Cabal
119
jobs:
1210
build:
1311
runs-on: ${{ matrix.os }}
1412
strategy:
1513
fail-fast: false
1614
matrix:
17-
ghc: ['9.6.2', '9.4.5', '9.2.8', '9.0.2']
18-
cabal: ['3.10.1.0']
15+
ghc: ['9.8', '9.6', '9.4', '9.2']
16+
cabal: ['latest']
1917
os: [ubuntu-latest]
2018
name: Cabal with GHC ${{ matrix.ghc }}
2119
steps:

‎.github/workflows/haskell-ci.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,20 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/haskell-CI/haskell-ci
9+
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.16.6.20230729
11+
# version: 0.17.20231012
1212
#
13-
# REGENDATA ("0.16.6.20230729",["github","hackage-server.cabal"])
13+
# REGENDATA ("0.17.20231012",["github","hackage-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
1717
push:
1818
branches:
1919
- master
20-
- ci*
2120
pull_request:
2221
branches:
2322
- master
24-
- ci*
2523
jobs:
2624
linux:
2725
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -34,14 +32,19 @@ jobs:
3432
strategy:
3533
matrix:
3634
include:
37-
- compiler: ghc-9.6.2
35+
- compiler: ghc-9.8.1
3836
compilerKind: ghc
39-
compilerVersion: 9.6.2
37+
compilerVersion: 9.8.1
4038
setup-method: ghcup
4139
allow-failure: false
42-
- compiler: ghc-9.4.5
40+
- compiler: ghc-9.6.3
4341
compilerKind: ghc
44-
compilerVersion: 9.4.5
42+
compilerVersion: 9.6.3
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.4.7
46+
compilerKind: ghc
47+
compilerVersion: 9.4.7
4548
setup-method: ghcup
4649
allow-failure: false
4750
- compiler: ghc-9.2.8
@@ -73,6 +76,7 @@ jobs:
7376
mkdir -p "$HOME/.ghcup/bin"
7477
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
7578
chmod a+x "$HOME/.ghcup/bin/ghcup"
79+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
7680
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
7781
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
7882
apt-get update
@@ -88,10 +92,12 @@ jobs:
8892
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
8993
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
9094
HCDIR=/opt/$HCKIND/$HCVER
91-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
95+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
96+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
97+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
9298
echo "HC=$HC" >> "$GITHUB_ENV"
93-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
94-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
99+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
100+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
95101
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
96102
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
97103
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

‎cabal.haskell-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
branches: master ci*
1+
branches: master
22

33
installed: +all -Cabal -Cabal-syntax -text -parsec -process
44

‎hackage-server.cabal

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ license: BSD-3-Clause
2828
license-file: LICENSE
2929

3030
tested-with:
31-
GHC == 9.6.2
32-
GHC == 9.4.5
31+
GHC == 9.8.1
32+
GHC == 9.6.3
33+
GHC == 9.4.7
3334
GHC == 9.2.8
3435
GHC == 9.0.2
3536
GHC == 8.10.7
@@ -130,16 +131,16 @@ common defaults
130131
, array >= 0.5 && < 0.6
131132
, base >= 4.13 && < 4.20
132133
, binary >= 0.8 && < 0.9
133-
, bytestring >= 0.10 && < 0.12
134-
, containers ^>= 0.6.0
134+
, bytestring >= 0.10 && < 0.13
135+
, containers >= 0.6.0 && < 0.8
135136
, deepseq >= 1.4 && < 1.6
136137
, directory >= 1.3 && < 1.4
137138
, filepath >= 1.4 && < 1.5
138139
, mtl >= 2.2.1 && < 2.4
139140
-- we use Control.Monad.Except, introduced in mtl-2.2.1
140141
, pretty >= 1.1 && < 1.2
141142
, process >= 1.6 && < 1.7
142-
, text ^>= 1.2.5.0 || ^>= 2.0
143+
, text ^>= 1.2.5.0 || >= 2.0 && < 2.2
143144
, time >= 1.9 && < 1.13
144145
, transformers >= 0.5 && < 0.7
145146
, unix >= 2.7 && < 2.9
@@ -450,7 +451,7 @@ library lib-server
450451
, stm ^>= 2.5.0
451452
, stringsearch ^>= 0.3.6.6
452453
, tagged ^>= 0.8.5
453-
, xhtml ^>= 3000.2
454+
, xhtml ^>= 3000.2.0.0
454455
, xmlgen ^>= 0.6
455456
, xss-sanitize ^>= 0.3.6
456457

@@ -579,12 +580,12 @@ test-suite ReverseDependenciesTest
579580
main-is: ReverseDependenciesTest.hs
580581
build-tool-depends: hackage-server:hackage-server
581582
build-depends:
582-
, tasty ^>= 1.4
583+
, tasty ^>= 1.5
583584
, tasty-golden ^>= 2.3
584585
, tasty-hedgehog ^>= 1.4
585586
, tasty-hunit ^>= 0.10
586587
, HUnit ^>= 1.6
587-
, hedgehog ^>= 1.3
588+
, hedgehog ^>= 1.4
588589
, exceptions
589590
, bimap
590591
, mime-mail
@@ -649,7 +650,7 @@ test-suite PackageTests
649650
build-depends:
650651
-- version constraints inherited from lib-server
651652
-- component-specific dependencies
652-
, tasty ^>= 1.4
653+
, tasty ^>= 1.5
653654
, tasty-hunit ^>= 0.10
654655
, HUnit ^>= 1.6
655656

@@ -667,7 +668,7 @@ test-suite HashTests
667668
, cryptohash-sha256
668669
, safecopy
669670
-- component-specific dependencies
670-
, tasty ^>= 1.4
671+
, tasty ^>= 1.5
671672
, tasty-hunit ^>= 0.10
672673

673674
test-suite DocTests

0 commit comments

Comments
 (0)