Skip to content

Commit

Permalink
Merge pull request #130 from haskellari/ci-update
Browse files Browse the repository at this point in the history
Remove allow-newer from cabal.project
  • Loading branch information
phadej authored Jan 5, 2025
2 parents 96a350d + b259055 commit c3ed6e6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20241223
# version: 0.19.20250104
#
# REGENDATA ("0.19.20241223",["github","cabal.project"])
# REGENDATA ("0.19.20250104",["github","cabal.project"])
#
name: Haskell-CI
on:
Expand Down Expand Up @@ -95,8 +95,8 @@ jobs:
chmod a+x "$HOME/.ghcup/bin/ghcup"
- name: Install cabal-install
run: |
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
Expand Down Expand Up @@ -223,8 +223,6 @@ jobs:
echo "package lattices" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
allow-newer: quickcheck-instances-0.3.32:base
allow-newer: these-1.2.1:base
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(lattices)$/; }' >> cabal.project.local
cat cabal.project
Expand Down
3 changes: 0 additions & 3 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
packages: .
tests: true

allow-newer: quickcheck-instances-0.3.32:base
allow-newer: these-1.2.1:base

0 comments on commit c3ed6e6

Please sign in to comment.