Skip to content

Commit 9513ffe

Browse files
andreasabelandreasabel
committed
Update CI to GHC 9.8; allow ansi-terminal-1.1 and containers-0.7
1 parent 218ea04 commit 9513ffe

File tree

6 files changed

+42
-228
lines changed

6 files changed

+42
-228
lines changed

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

Lines changed: 24 additions & 17 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.16.1
11+
# version: 0.17.20240109
1212
#
13-
# REGENDATA ("0.16.1",["github","cabal.project"])
13+
# REGENDATA ("0.17.20240109",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -34,19 +34,24 @@ jobs:
3434
strategy:
3535
matrix:
3636
include:
37-
- compiler: ghc-9.6.1
37+
- compiler: ghc-9.8.1
3838
compilerKind: ghc
39-
compilerVersion: 9.6.1
39+
compilerVersion: 9.8.1
4040
setup-method: ghcup
4141
allow-failure: false
42-
- compiler: ghc-9.4.5
42+
- compiler: ghc-9.6.4
4343
compilerKind: ghc
44-
compilerVersion: 9.4.5
44+
compilerVersion: 9.6.4
4545
setup-method: ghcup
4646
allow-failure: false
47-
- compiler: ghc-9.2.7
47+
- compiler: ghc-9.4.8
4848
compilerKind: ghc
49-
compilerVersion: 9.2.7
49+
compilerVersion: 9.4.8
50+
setup-method: ghcup
51+
allow-failure: false
52+
- compiler: ghc-9.2.8
53+
compilerKind: ghc
54+
compilerVersion: 9.2.8
5055
setup-method: ghcup
5156
allow-failure: false
5257
- compiler: ghc-9.0.2
@@ -122,20 +127,20 @@ jobs:
122127
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
123128
if [ "${{ matrix.setup-method }}" = ghcup ]; then
124129
mkdir -p "$HOME/.ghcup/bin"
125-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
130+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
126131
chmod a+x "$HOME/.ghcup/bin/ghcup"
127132
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
128-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
133+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
129134
apt-get update
130135
apt-get install -y libxml2-dev
131136
else
132137
apt-add-repository -y 'ppa:hvr/ghc'
133138
apt-get update
134139
apt-get install -y "$HCNAME" libxml2-dev
135140
mkdir -p "$HOME/.ghcup/bin"
136-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
141+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
137142
chmod a+x "$HOME/.ghcup/bin/ghcup"
138-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
143+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
139144
fi
140145
env:
141146
HCKIND: ${{ matrix.compilerKind }}
@@ -149,17 +154,19 @@ jobs:
149154
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
150155
HCDIR=/opt/$HCKIND/$HCVER
151156
if [ "${{ matrix.setup-method }}" = ghcup ]; then
152-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
157+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
158+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
159+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
153160
echo "HC=$HC" >> "$GITHUB_ENV"
154-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
155-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
156-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
161+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
162+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
163+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
157164
else
158165
HC=$HCDIR/bin/$HCKIND
159166
echo "HC=$HC" >> "$GITHUB_ENV"
160167
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
161168
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
162-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
169+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
163170
fi
164171
165172
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

‎.travis.yml‎

Lines changed: 0 additions & 197 deletions
This file was deleted.

‎core/test-framework.cabal‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ Bug-Reports: https://github.com/haskell/test-framework/issues
1515
Build-Type: Simple
1616

1717
Tested-With:
18-
GHC == 9.6.1
19-
GHC == 9.4.5
20-
GHC == 9.2.7
18+
GHC == 9.8.1
19+
GHC == 9.6.4
20+
GHC == 9.4.8
21+
GHC == 9.2.8
2122
GHC == 9.0.2
2223
GHC == 8.10.7
2324
GHC == 8.8.4
@@ -63,10 +64,10 @@ Library
6364
Test.Framework.Utilities
6465

6566
Build-Depends: base >= 4.3 && < 5
66-
, ansi-terminal >= 0.4.0 && < 1.1
67+
, ansi-terminal >= 0.4.0 && < 1.2
6768
, ansi-wl-pprint >= 0.5.1 && < 1.1
6869
, random >= 1.0 && < 1.3
69-
, containers >= 0.1 && < 0.7
70+
, containers >= 0.1 && < 0.8
7071
, regex-posix >= 0.72 && < 0.97
7172
, old-locale >= 1.0 && < 1.1
7273
, time >= 1.1.2 && < 1.13

‎example/test-framework-example.cabal‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ Homepage: http://batterseapower.github.com/test-framework/
1212
Build-Type: Simple
1313

1414
Tested-With:
15-
GHC == 9.6.1
16-
GHC == 9.4.5
17-
GHC == 9.2.7
15+
GHC == 9.8.1
16+
GHC == 9.6.4
17+
GHC == 9.4.8
18+
GHC == 9.2.8
1819
GHC == 9.0.2
1920
GHC == 8.10.7
2021
GHC == 8.8.4

‎hunit/test-framework-hunit.cabal‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ Build-Type: Simple
1313
Description: @HUnit@ support for the @test-framework@ package.
1414

1515
Tested-With:
16-
GHC == 9.6.1
17-
GHC == 9.4.5
18-
GHC == 9.2.7
16+
GHC == 9.8.1
17+
GHC == 9.6.4
18+
GHC == 9.4.8
19+
GHC == 9.2.8
1920
GHC == 9.0.2
2021
GHC == 8.10.7
2122
GHC == 8.8.4

‎quickcheck2/test-framework-quickcheck2.cabal‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ Build-Type: Simple
1414
Description: Allows @QuickCheck-2@ properties to be used with the </package/test-framework test-framework package>.
1515

1616
Tested-With:
17-
GHC == 9.6.1
18-
GHC == 9.4.5
19-
GHC == 9.2.7
17+
GHC == 9.8.1
18+
GHC == 9.6.4
19+
GHC == 9.4.8
20+
GHC == 9.2.8
2021
GHC == 9.0.2
2122
GHC == 8.10.7
2223
GHC == 8.8.4

0 commit comments

Comments
 (0)