Skip to content

Commit 645af58

Browse files
authored
Merge pull request #46 from haskellari/ci-update
Remove allow-newer from cabal.project
2 parents 1839bf1 + d9041a6 commit 645af58

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 4 additions & 8 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.20250104
1212
#
13-
# REGENDATA ("0.19.20241223",["--config=cabal.haskell-ci","github","cabal.project"])
13+
# REGENDATA ("0.19.20250104",["--config=cabal.haskell-ci","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: |
@@ -211,10 +211,6 @@ jobs:
211211
if [ $((HCNUMVER < 91200)) -ne 0 ] ; then echo "package indexed-traversable-benchmarks" >> cabal.project ; fi
212212
if [ $((HCNUMVER < 91200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
213213
cat >> cabal.project <<EOF
214-
allow-newer: quickcheck-instances:base
215-
allow-newer: quickcheck-instances:containers
216-
allow-newer: these:base
217-
allow-newer: semialign:base
218214
EOF
219215
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(indexed-traversable|indexed-traversable-benchmarks|indexed-traversable-instances)$/; }' >> cabal.project.local
220216
cat cabal.project

cabal.project

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,3 @@ package indexed-traversable-instances
1212

1313
package indexed-traversable-benchmarks
1414
ghc-options: -Wall
15-
16-
allow-newer: quickcheck-instances:base
17-
allow-newer: quickcheck-instances:containers
18-
allow-newer: these:base
19-
allow-newer: semialign:base

0 commit comments

Comments
 (0)