Skip to content

Commit f897099

Browse files
committed
Remove allow-newer from cabal.project
1 parent 7bc33b5 commit f897099

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

.github/workflows/haskell-ci.yml

+4-6
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.20250104
1212
#
13-
# REGENDATA ("0.19.20241223",["github","cabal.project"])
13+
# REGENDATA ("0.19.20250104",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -95,8 +95,8 @@ jobs:
9595
chmod a+x "$HOME/.ghcup/bin/ghcup"
9696
- name: Install cabal-install
9797
run: |
98-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
99-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
98+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
99+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV"
100100
- name: Install GHC (GHCup)
101101
if: matrix.setup-method == 'ghcup'
102102
run: |
@@ -199,8 +199,6 @@ jobs:
199199
echo "package binary-orphans" >> cabal.project
200200
echo " ghc-options: -Werror=missing-methods" >> cabal.project
201201
cat >> cabal.project <<EOF
202-
allow-newer: quickcheck-instances:base
203-
allow-newer: these:base
204202
EOF
205203
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(binary-orphans)$/; }' >> cabal.project.local
206204
cat cabal.project

cabal.project

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
packages: .
22
tests: True
3-
4-
allow-newer: quickcheck-instances:base
5-
allow-newer: these:base

0 commit comments

Comments
 (0)