diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index d2dde6c..0025f4b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -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",["--config=cabal.haskell-ci","github","cabal.project"]) +# REGENDATA ("0.19.20250104",["--config=cabal.haskell-ci","github","cabal.project"]) # name: Haskell-CI on: @@ -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: | @@ -211,10 +211,6 @@ jobs: if [ $((HCNUMVER < 91200)) -ne 0 ] ; then echo "package indexed-traversable-benchmarks" >> cabal.project ; fi if [ $((HCNUMVER < 91200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local cat cabal.project diff --git a/cabal.project b/cabal.project index 492939a..4907776 100644 --- a/cabal.project +++ b/cabal.project @@ -12,8 +12,3 @@ package indexed-traversable-instances package indexed-traversable-benchmarks ghc-options: -Wall - -allow-newer: quickcheck-instances:base -allow-newer: quickcheck-instances:containers -allow-newer: these:base -allow-newer: semialign:base