From a806930ad29a8e6e804c989c921c241be7e0574b Mon Sep 17 00:00:00 2001 From: John Ky Date: Wed, 13 Jan 2021 16:26:54 +1100 Subject: [PATCH] Fix haddock publishing --- .github/workflows/github-page.yml | 2 +- scripts/haddocs.sh | 10 ++++++---- scripts/prolog | 12 ++++++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/github-page.yml b/.github/workflows/github-page.yml index 11061c89cdc..2c4e7312e70 100644 --- a/.github/workflows/github-page.yml +++ b/.github/workflows/github-page.yml @@ -27,7 +27,7 @@ jobs: echo "CABAL_BUILDDIR=$CABAL_BUILDDIR" >> $GITHUB_ENV - name: Set cache version - run: echo "CACHE_VERSION=myfzgX7" >> $GITHUB_ENV + run: echo "CACHE_VERSION=usE8bDW" >> $GITHUB_ENV - name: Add build script path run: echo "$(pwd)/.github/bin" >> $GITHUB_PATH diff --git a/scripts/haddocs.sh b/scripts/haddocs.sh index a9c7b007fbc..265d860c881 100755 --- a/scripts/haddocs.sh +++ b/scripts/haddocs.sh @@ -40,12 +40,13 @@ HADDOCK_OPTS=( --haddock-hyperlink-source --haddock-option "--show-all" --haddock-option "--use-unicode" - --haddock-option "--use-contents=\"../index.html\"" + --disable-tests + --keep-going ) # build documentation of all modules if [ ${REGENERATE} == "true" ]; then - cabal haddock "${HADDOCK_OPTS[@]}" cardano-api + cabal haddock "${HADDOCK_OPTS[@]}" all elif [ ${REGENERATE} != "false" ]; then cabal haddock "${HADDOCK_OPTS[@]}" ${REGENERATE} fi @@ -67,7 +68,9 @@ done # --read-interface options interface_options () { for package in $(ls "${OUTPUT_DIR}"); do - echo "--read-interface=${package},${OUTPUT_DIR}/${package}/${package}.haddock" + if [ -f "${OUTPUT_DIR}/${package}/${package}.haddock" ]; then + echo "--read-interface=${package},${OUTPUT_DIR}/${package}/${package}.haddock" + fi done } @@ -80,7 +83,6 @@ haddock \ --gen-index \ --gen-contents \ --quickjump \ - --prolog ./scripts/prolog \ $(interface_options) # Assemble a toplevel `doc-index.json` from package level ones. diff --git a/scripts/prolog b/scripts/prolog index 2db7b3e5573..a427ee6ea6c 100644 --- a/scripts/prolog +++ b/scripts/prolog @@ -2,6 +2,14 @@ [skip to module list](#module-list) -This site contains Haskell documentation of +This site contains Haskell documentation of: -* __[Cardano API](cardano-api/Cardano-API.html)__ +* __[Cardano Api ](cardano-api/doc-index.html)__ +* __[Cardano Api-test ](cardano-api-test/doc-index.html)__ +* __[Cardano Cli ](cardano-cli/doc-index.html)__ +* __[Cardano Config ](cardano-config/doc-index.html)__ +* __[Cardano Node ](cardano-node/doc-index.html)__ +* __[Cardano Node ](cardano-node/doc-index.html)__ +* __[Cardano Node-chairman ](cardano-node-chairman/doc-index.html)__ +* __[Cardano Testnet ](cardano-testnet/doc-index.html)__ +* __[Hedgehog Extras ](hedgehog-extras/doc-index.html)__