Skip to content

Commit

Permalink
New ./scripts/combined-haddock.sh (#6205)
Browse files Browse the repository at this point in the history
  • Loading branch information
zeme-wana committed Jun 19, 2024
1 parent a94bffd commit 7dbbd7f
Show file tree
Hide file tree
Showing 5 changed files with 314 additions and 90 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/combined-haddock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:

- name: Build Haddock
run: |
nix develop --accept-flake-config --command bash ./scripts/combined-haddock.sh
nix develop --accept-flake-config --command bash ./scripts/combined-haddock.sh haddock all
- name: Deploy Haddock
uses: JamesIves/github-pages-deploy-action@v4
with:
# This folder is generated in the step above
folder: combined_haddock_dst
folder: haddock
target-folder: haddock/${{ github.ref_name }}
# combined_haddock_dst is ~400MB and keeping the entire history is unnecessary.
# haddock is ~400MB and keeping the entire history is unnecessary.
single-commit: true
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ cabal-dev
cabal.sandbox.config
cabal.config
cabal.project.local
cabal.project.freeze

# Stack
.stack-work
Expand Down Expand Up @@ -99,7 +100,8 @@ node.sock
.pre-commit-config.yaml
secrets/*/.gpg-id
ghcid.txt
combined_haddock*
haddock
linkchecker-out.txt
plutus-pab/test-node/testnet/db
plutus-pab/test-node/alonzo-purple/db
*.actual.json
Expand Down
12 changes: 1 addition & 11 deletions nix/project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let
src = ../.;

shell = {
withHoogle = false;
withHoogle = true;
# We would expect R to be pulled in automatically as it's a dependency of
# plutus-core, but it appears it is not, so we need to be explicit about
# the dependency on R here. Adding it as a buildInput will ensure it's
Expand Down Expand Up @@ -80,16 +80,6 @@ let
# Common
{
packages = {
# Packages we just don't want docs for
plutus-benchmark.doHaddock = false;

# FIXME: Haddock mysteriously gives a spurious missing-home-modules warning
plutus-tx-plugin.doHaddock = false;

# Something goes wrong with the custom setup
# https://github.com/input-output-hk/haskell.nix/issues/2019
prettyprinter-configurable.doHaddock = false;

# In this case we can just propagate the native dependencies for the build of
# the test executable, which are actually set up right (we have a
# build-tool-depends on the executable we need)
Expand Down
1 change: 1 addition & 0 deletions nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ in
pkgs.gawk
pkgs.scriv
pkgs.fswatch
pkgs.linkchecker

# Needed to make building things work, not for commands
pkgs.zlib
Expand Down
Loading

0 comments on commit 7dbbd7f

Please sign in to comment.