Skip to content

Commit 9542188

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 c9227c8 commit 9542188

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

.github/workflows/haskell-ci.yml

+4-18
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:
@@ -66,7 +66,7 @@ jobs:
6666
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
6767
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
6868
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
69-
echo "HEADHACKAGE=true" >> "$GITHUB_ENV"
69+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
7070
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
7171
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
7272
env:
@@ -95,17 +95,6 @@ jobs:
9595
repository hackage.haskell.org
9696
url: http://hackage.haskell.org/
9797
EOF
98-
if $HEADHACKAGE; then
99-
cat >> $CABAL_CONFIG <<EOF
100-
repository head.hackage.ghc.haskell.org
101-
url: https://ghc.gitlab.haskell.org/head.hackage/
102-
secure: True
103-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
104-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
105-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
106-
key-threshold: 3
107-
EOF
108-
fi
10998
cat >> $CABAL_CONFIG <<EOF
11099
program-default-options
111100
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -159,10 +148,7 @@ jobs:
159148
package eliminators
160149
ghc-options: -Werror
161150
EOF
162-
if $HEADHACKAGE; then
163-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
164-
fi
165-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(eliminators)$/; }' >> cabal.project.local
151+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(Cabal|Cabal-syntax|eliminators)$/; }' >> cabal.project.local
166152
cat cabal.project
167153
cat cabal.project.local
168154
- name: dump install plan

cabal.haskell-ci

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ distribution: jammy
22
no-tests-no-benchmarks: False
33
unconstrained: False
44
local-ghc-options: -Werror
5-
-- Using `active-repositories: ..., head.hackage.ghc.haskell.org:override`
6-
-- tends not to work well with singletons-base's custom Setup script.
7-
head-hackage-override: False
5+
-- Needed to avoid https://github.com/haskell/cabal/issues/9917
6+
installed: +all -Cabal -Cabal-syntax

0 commit comments

Comments
 (0)