From 4396d36fa6f1f27770c183236ee0edcf920cf4d3 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Wed, 31 Jan 2024 08:29:40 -0500 Subject: [PATCH] Work around haskell/haddock#574 --- .github/workflows/haskell-ci.yml | 6 +++--- cabal.haskell-ci | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 cabal.haskell-ci diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 45a0f32..60b4a63 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,6 +1,6 @@ # This GitHub workflow config has been generated by a script via # -# haskell-ci 'github' 'cabal.project' +# haskell-ci 'github' '--config=cabal.haskell-ci' 'cabal.project' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # version: 0.16.6 # -# REGENDATA ("0.16.6",["github","cabal.project"]) +# REGENDATA ("0.16.6",["github","--config=cabal.haskell-ci","cabal.project"]) # name: Haskell-CI on: @@ -261,7 +261,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 < 80000 || HCNUMVER >= 80400)) -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 new file mode 100644 index 0000000..02d88f9 --- /dev/null +++ b/cabal.haskell-ci @@ -0,0 +1,2 @@ +-- Work around https://github.com/haskell/haddock/issues/574 +haddock: <8.0 || >=8.4