Skip to content

Commit

Permalink
Remove allow-newers
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanGlScott committed Jan 15, 2025
1 parent f89811a commit 3c770f2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 29 deletions.
19 changes: 4 additions & 15 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.20250115
#
# REGENDATA ("0.19.20241223",["github","--config=cabal.haskell-ci","cabal.project"])
# REGENDATA ("0.19.20250115",["github","--config=cabal.haskell-ci","cabal.project"])
#
name: Haskell-CI
on:
Expand Down Expand Up @@ -107,8 +107,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.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
Expand Down Expand Up @@ -232,17 +232,6 @@ jobs:
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package lens-properties" >> cabal.project ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
allow-newer: aeson:ghc-prim
allow-newer: aeson:template-haskell
allow-newer: binary-orphans:base
allow-newer: boring:base
allow-newer: indexed-traversable:base
allow-newer: indexed-traversable-instances:base
allow-newer: integer-conversion:base
allow-newer: microstache:base
allow-newer: semialign:base
allow-newer: these:base
allow-newer: uuid-types:template-haskell
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(lens|lens-examples|lens-properties)$/; }' >> cabal.project.local
cat cabal.project
Expand Down
14 changes: 0 additions & 14 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
packages: .
./examples
./lens-properties

-- TODO: Remove this once the ecosystem has caught up with GHC 9.12
allow-newer:
aeson:ghc-prim,
aeson:template-haskell,
binary-orphans:base,
boring:base,
indexed-traversable:base,
indexed-traversable-instances:base,
integer-conversion:base,
microstache:base,
semialign:base,
these:base,
uuid-types:template-haskell

0 comments on commit 3c770f2

Please sign in to comment.