Skip to content

Commit a06c68c

Browse files
committed
Haskell-CI: include GHC 9.6.1 alpha3
1 parent cc24610 commit a06c68c

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ jobs:
3434
strategy:
3535
matrix:
3636
include:
37+
- compiler: ghc-9.6.0.20230210
38+
compilerKind: ghc
39+
compilerVersion: 9.6.0.20230210
40+
setup-method: ghcup
41+
allow-failure: true
3742
- compiler: ghc-9.4.4
3843
compilerKind: ghc
3944
compilerVersion: 9.4.4
@@ -93,7 +98,7 @@ jobs:
9398
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
9499
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
95100
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
96-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
101+
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
97102
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
98103
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
99104
env:
@@ -122,6 +127,18 @@ jobs:
122127
repository hackage.haskell.org
123128
url: http://hackage.haskell.org/
124129
EOF
130+
if $HEADHACKAGE; then
131+
cat >> $CABAL_CONFIG <<EOF
132+
repository head.hackage.ghc.haskell.org
133+
url: https://ghc.gitlab.haskell.org/head.hackage/
134+
secure: True
135+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
136+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
137+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
138+
key-threshold: 3
139+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
140+
EOF
141+
fi
125142
cat >> $CABAL_CONFIG <<EOF
126143
program-default-options
127144
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -173,6 +190,9 @@ jobs:
173190
echo " ghc-options: -Werror=missing-methods" >> cabal.project
174191
cat >> cabal.project <<EOF
175192
EOF
193+
if $HEADHACKAGE; then
194+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
195+
fi
176196
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|hackage-server|parsec|process|text)$/; }' >> cabal.project.local
177197
cat cabal.project
178198
cat cabal.project.local

hackage-server.cabal

Lines changed: 1 addition & 1 deletion
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.4.4, 9.2.6, 9.0.2, 8.10.7, 8.8.4 }
30+
tested-with: GHC == { 9.6.0, 9.4.4, 9.2.6, 9.0.2, 8.10.7, 8.8.4 }
3131

3232
data-dir: datafiles
3333
data-files:

0 commit comments

Comments
 (0)