Skip to content

Commit 7e5c92d

Browse files
committed
Regenerate CI
We no longer need to use `head.hackage` to make the GHC 9.10 build work. We do need to apply a workaround for haskell/cabal#9917, however.
1 parent 33f2992 commit 7e5c92d

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 4 additions & 18 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.19.20240512
11+
# version: 0.19.20240514
1212
#
13-
# REGENDATA ("0.19.20240512",["github","cabal.project"])
13+
# REGENDATA ("0.19.20240514",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -121,7 +121,7 @@ jobs:
121121
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
122122
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
123123
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
124-
if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
124+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
125125
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
126126
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
127127
env:
@@ -150,17 +150,6 @@ jobs:
150150
repository hackage.haskell.org
151151
url: http://hackage.haskell.org/
152152
EOF
153-
if $HEADHACKAGE; then
154-
cat >> $CABAL_CONFIG <<EOF
155-
repository head.hackage.ghc.haskell.org
156-
url: https://ghc.gitlab.haskell.org/head.hackage/
157-
secure: True
158-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
159-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
160-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
161-
key-threshold: 3
162-
EOF
163-
fi
164153
cat >> $CABAL_CONFIG <<EOF
165154
program-default-options
166155
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -228,10 +217,7 @@ jobs:
228217
location: https://github.com/goldfirere/th-desugar
229218
tag: ae6c075edb50175a99b35f0bdcf475b695a5ee78
230219
EOF
231-
if $HEADHACKAGE; then
232-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
233-
fi
234-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(singletons|singletons-base|singletons-th)$/; }' >> cabal.project.local
220+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(Cabal|Cabal-syntax|singletons|singletons-base|singletons-th)$/; }' >> cabal.project.local
235221
cat cabal.project
236222
cat cabal.project.local
237223
- name: dump install plan

cabal.haskell-ci

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ unconstrained: False
44
jobs-selection: any
55
-- Needed to avoid https://github.com/haskell/cabal/issues/5423
66
haddock-components: libs
7-
-- Using `active-repositories: ..., head.hackage.ghc.haskell.org:override`
8-
-- tends not to work well with singletons-base's custom Setup script.
9-
head-hackage-override: False
7+
-- Needed to avoid https://github.com/haskell/cabal/issues/9917
8+
installed: +all -Cabal -Cabal-syntax

0 commit comments

Comments
 (0)