Skip to content

Commit 2c74520

Browse files
committed
unbreak CI
1 parent 03698aa commit 2c74520

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215
echo " ghc-options: -Werror=missing-methods" >> cabal.project
216216
cat >> cabal.project <<EOF
217217
EOF
218-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(strict-containers|strict-containers-lens|strict-containers-serialise|strict-containers-tests)$/; }' >> cabal.project.local
218+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(binary|containers|strict-containers|strict-containers-lens|strict-containers-serialise|strict-containers-tests|text)$/; }' >> cabal.project.local
219219
cat cabal.project
220220
cat cabal.project.local
221221
- name: dump install plan

cabal.haskell-ci

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ install-dependencies: False
55

66
-- to allow different set of packages per GHC versions
77
jobs-selection: any
8+
9+
-- we depend on containers which is a core package (comes installed with ghc)
10+
-- by default, haskell-ci forbids these from being upgraded; override that here
11+
-- also override the rdeps of containers, as per their haskell-ci config
12+
installed: +all -containers -binary -text

0 commit comments

Comments
 (0)