Skip to content

Commit e601a95

Browse files
andreasabelandreasabel
committed
Bump Haskell CI to GHC 9.8.0 and 9.4.6; allow text-2.1
1 parent 1effc46 commit e601a95

File tree

2 files changed

+38
-13
lines changed

2 files changed

+38
-13
lines changed

‎.github/workflows/haskell-ci.yml

+34-10
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.4
11+
# version: 0.17.20230824
1212
#
13-
# REGENDATA ("0.16.4",["github","--no-cabal-check","agda-stdlib-utils.cabal"])
13+
# REGENDATA ("0.17.20230824",["github","--no-cabal-check","agda-stdlib-utils.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -44,14 +44,19 @@ jobs:
4444
strategy:
4545
matrix:
4646
include:
47+
- compiler: ghc-9.8.0.20230822
48+
compilerKind: ghc
49+
compilerVersion: 9.8.0.20230822
50+
setup-method: ghcup
51+
allow-failure: true
4752
- compiler: ghc-9.6.2
4853
compilerKind: ghc
4954
compilerVersion: 9.6.2
5055
setup-method: ghcup
5156
allow-failure: false
52-
- compiler: ghc-9.4.5
57+
- compiler: ghc-9.4.6
5358
compilerKind: ghc
54-
compilerVersion: 9.4.5
59+
compilerVersion: 9.4.6
5560
setup-method: ghcup
5661
allow-failure: false
5762
- compiler: ghc-9.2.8
@@ -87,17 +92,19 @@ jobs:
8792
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8893
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8994
mkdir -p "$HOME/.ghcup/bin"
90-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
95+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
9196
chmod a+x "$HOME/.ghcup/bin/ghcup"
97+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
9298
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
9399
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
94100
else
95101
apt-add-repository -y 'ppa:hvr/ghc'
96102
apt-get update
97103
apt-get install -y "$HCNAME"
98104
mkdir -p "$HOME/.ghcup/bin"
99-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
105+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
100106
chmod a+x "$HOME/.ghcup/bin/ghcup"
107+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
101108
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
102109
fi
103110
env:
@@ -112,10 +119,12 @@ jobs:
112119
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
113120
HCDIR=/opt/$HCKIND/$HCVER
114121
if [ "${{ matrix.setup-method }}" = ghcup ]; then
115-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
122+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
123+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
124+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
116125
echo "HC=$HC" >> "$GITHUB_ENV"
117-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
118-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
126+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
127+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
119128
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120129
else
121130
HC=$HCDIR/bin/$HCKIND
@@ -129,7 +138,7 @@ jobs:
129138
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
130139
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
131140
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
132-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
141+
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
133142
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
134143
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
135144
env:
@@ -158,6 +167,18 @@ jobs:
158167
repository hackage.haskell.org
159168
url: http://hackage.haskell.org/
160169
EOF
170+
if $HEADHACKAGE; then
171+
cat >> $CABAL_CONFIG <<EOF
172+
repository head.hackage.ghc.haskell.org
173+
url: https://ghc.gitlab.haskell.org/head.hackage/
174+
secure: True
175+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
176+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
177+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
178+
key-threshold: 3
179+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
180+
EOF
181+
fi
161182
cat >> $CABAL_CONFIG <<EOF
162183
program-default-options
163184
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -209,6 +230,9 @@ jobs:
209230
echo " ghc-options: -Werror=missing-methods" >> cabal.project
210231
cat >> cabal.project <<EOF
211232
EOF
233+
if $HEADHACKAGE; then
234+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
235+
fi
212236
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(agda-stdlib-utils)$/; }' >> cabal.project.local
213237
cat cabal.project
214238
cat cabal.project.local

‎agda-stdlib-utils.cabal

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ description: Helper programs for setting up the Agda standard library.
66
license: MIT
77

88
tested-with:
9+
GHC == 9.8.0
910
GHC == 9.6.2
10-
GHC == 9.4.5
11+
GHC == 9.4.6
1112
GHC == 9.2.8
1213
GHC == 9.0.2
1314
GHC == 8.10.7
@@ -22,7 +23,7 @@ common common-build-parameters
2223
PatternSynonyms
2324

2425
build-depends:
25-
base >= 4.12.0.0 && < 4.19
26+
base >= 4.12.0.0 && < 4.20
2627
, filemanip >= 0.3.6.2 && < 0.4
2728

2829
executable GenerateEverything
@@ -41,4 +42,4 @@ executable AllNonAsciiChars
4142
main-is: AllNonAsciiChars.hs
4243

4344
build-depends:
44-
text >= 1.2.3.1 && < 2.1
45+
text >= 1.2.3.1 && < 2.2

0 commit comments

Comments
 (0)