From 15f77e8f4b1fdc397fae1ccf09a62d67dcba46ff Mon Sep 17 00:00:00 2001 From: sorki Date: Sat, 2 Dec 2023 10:25:46 +0100 Subject: [PATCH] ci: disable haddock step takes too long and it runs in nix-build anyway. Ideally we would do `cabal haddock-project` but that is not yet available everywhere (due to older haddock). Maybe revisit later. --- .github/workflows/ci.dhall | 1 + .github/workflows/ci.dhall.frozen | 1 + .github/workflows/ci.sh | 2 ++ .github/workflows/ci.yaml | 2 -- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.dhall b/.github/workflows/ci.dhall index be5f523..95e9343 100644 --- a/.github/workflows/ci.dhall +++ b/.github/workflows/ci.dhall @@ -6,6 +6,7 @@ let defSteps = haskellCi.defaultCabalSteps in haskellCi.generalCi ( haskellCi.withNix ( defSteps + with docStep = None haskellCi.BuildStep with extraSteps.pre = defSteps.extraSteps.pre diff --git a/.github/workflows/ci.dhall.frozen b/.github/workflows/ci.dhall.frozen index b5fd098..f03ce19 100644 --- a/.github/workflows/ci.dhall.frozen +++ b/.github/workflows/ci.dhall.frozen @@ -7,6 +7,7 @@ let defSteps = haskellCi.defaultCabalSteps in haskellCi.generalCi ( haskellCi.withNix ( defSteps + with docStep = None haskellCi.BuildStep with extraSteps.pre = defSteps.extraSteps.pre diff --git a/.github/workflows/ci.sh b/.github/workflows/ci.sh index ed97ca9..1deabb9 100755 --- a/.github/workflows/ci.sh +++ b/.github/workflows/ci.sh @@ -7,6 +7,8 @@ cd "$( dirname "${BASH_SOURCE[0]}" )" which dhall || cabal install dhall which dhall-to-yaml || cabal install dhall-yaml +echo "dhall format-ing ci.dhall" +dhall format ci.dhall echo "cp haskellCi.dhall -> ci.dhall.frozen" cp ci.dhall ci.dhall.frozen echo "dhall freez-ing ci.dhall.frozen" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af33f14..6dcffea 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,8 +40,6 @@ jobs: run: "cabal build all --enable-tests --enable-benchmarks" - name: test all run: "cabal test all --enable-tests" - - name: haddock all - run: cabal haddock all - name: Build with Nix run: "nix-build --argstr compiler $(echo ghc${{ matrix.ghc }} | tr -d '.')" strategy: