Skip to content

Commit 69a9901

Browse files
committed
1 parent c1f9416 commit 69a9901

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 3 additions & 3 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.20241021
11+
# version: 0.19.20240708
1212
#
13-
# REGENDATA ("0.19.20241021",["github","cabal.project"])
13+
# REGENDATA ("0.19.20240708",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -87,7 +87,6 @@ jobs:
8787
mkdir -p "$HOME/.ghcup/bin"
8888
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
8989
chmod a+x "$HOME/.ghcup/bin/ghcup"
90-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
9190
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
9291
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9392
env:
@@ -197,6 +196,7 @@ jobs:
197196
echo "package javascript-bridge-benchmarks" >> cabal.project
198197
echo " ghc-options: -Werror=missing-methods" >> cabal.project
199198
cat >> cabal.project <<EOF
199+
allow-newer: websockets:containers
200200
EOF
201201
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(javascript-bridge|javascript-bridge-benchmarks)$/; }' >> cabal.project.local
202202
cat cabal.project

cabal.project

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
packages: .
22
./benchmarks
3+
4+
-- Workaround until https://github.com/jaspervdj/websockets/pull/254 is merged
5+
allow-newer: websockets:containers

0 commit comments

Comments
 (0)