Skip to content

Commit 4858fd3

Browse files
committed
Remove allow-newers
1 parent 84ce469 commit 4858fd3

File tree

2 files changed

+4
-27
lines changed

2 files changed

+4
-27
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 4 additions & 14 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.20241223
11+
# version: 0.19.20250115
1212
#
13-
# REGENDATA ("0.19.20241223",["github","cabal.project"])
13+
# REGENDATA ("0.19.20250115",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -96,8 +96,8 @@ jobs:
9696
chmod a+x "$HOME/.ghcup/bin/ghcup"
9797
- name: Install cabal-install
9898
run: |
99-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
99+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
101101
- name: Install GHC (GHCup)
102102
if: matrix.setup-method == 'ghcup'
103103
run: |
@@ -206,16 +206,6 @@ jobs:
206206
echo "package javascript-bridge-benchmarks" >> cabal.project
207207
echo " ghc-options: -Werror=missing-methods" >> cabal.project
208208
cat >> cabal.project <<EOF
209-
allow-newer: aeson:ghc-prim
210-
allow-newer: aeson:template-haskell
211-
allow-newer: binary-orphans:base
212-
allow-newer: indexed-traversable:base
213-
allow-newer: indexed-traversable-instances:base
214-
allow-newer: integer-conversion:base
215-
allow-newer: microstache:base
216-
allow-newer: semialign:base
217-
allow-newer: these:base
218-
allow-newer: uuid-types:template-haskell
219209
EOF
220210
$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
221211
cat cabal.project

cabal.project

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
11
packages: .
22
./benchmarks
3-
4-
-- TODO: Remove this once the ecosystem has caught up with GHC 9.12
5-
allow-newer:
6-
aeson:ghc-prim,
7-
aeson:template-haskell,
8-
binary-orphans:base,
9-
indexed-traversable:base,
10-
indexed-traversable-instances:base,
11-
integer-conversion:base,
12-
microstache:base,
13-
semialign:base,
14-
these:base,
15-
uuid-types:template-haskell

0 commit comments

Comments
 (0)