diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 8e66885..f646a98 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -205,10 +205,10 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_tar}" >> cabal.project echo "packages: ${PKGDIR_htar}" >> cabal.project - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package tar" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package htar" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + echo "package tar" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo "package htar" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local @@ -245,7 +245,7 @@ jobs: ${CABAL} -vnormal check - name: haddock run: | - $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi - name: unconstrained build run: | rm -f cabal.project.local diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 5def30c..7540280 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1 +1,2 @@ installed: -directory +haddock: >= 8.6 diff --git a/htar/htar.cabal b/htar/htar.cabal index 50480ee..4393ae1 100644 --- a/htar/htar.cabal +++ b/htar/htar.cabal @@ -19,8 +19,7 @@ description: A Command-line utility to create, extract and list the build-type: Simple cabal-version: 2.0 tested-with: GHC==9.8.1, GHC==9.6.3, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2, - GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, - GHC==8.2.2, GHC==8.0.2 + GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4 executable htar default-language: Haskell2010