Skip to content

Commit fb5d4fb

Browse files
committed
Build Haddock deps as well
Resolves #57
1 parent f5c3787 commit fb5d4fb

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

.github/workflows/haskell.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ jobs:
2424
env:
2525
cache-name: cache-stack
2626
with:
27-
path: ~/.stack
27+
path: |
28+
~/.stack
29+
.stack-work
2830
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.stack') }}
2931
restore-keys: |
3032
${{ runner.os }}-build-${{ env.cache-name }}-
@@ -44,14 +46,10 @@ jobs:
4446
stack-arguments: --ghc-options -Werror
4547

4648
- name: "Haddock: build"
47-
# Not sure why it’s not $(stack path --local-doc-root) but the generated
48-
# directory isn’t right, reproducible locally. Haddock reports
49-
# a different one at the end of its run, and *that* is where the
50-
# documentation is.
5149
run: |
52-
stack haddock --fast --no-haddock-deps
53-
echo "haddock_files=$(stack path --local-install-root)/doc/" >> "$GITHUB_ENV"
54-
echo "stack path --local-install-root: $(stack path --local-install-root)"
50+
stack haddock generative-art:lib --fast
51+
echo "haddock_files=$(stack path --local-doc-root)/" >> "$GITHUB_ENV"
52+
echo "stack path --local-doc-root: $(stack path --local-doc-root)"
5553
5654
- name: "Haddock: package"
5755
uses: actions/upload-pages-artifact@v1 # This will automatically upload an artifact from the '/_site' directory

package.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ default-extensions:
5151
- RecordWildCards
5252

5353
extra-doc-files:
54-
- docs/bezier/**/*.svg
5554
- docs/billard/**/*.svg
5655
- docs/colors/schemes/continuous/**/*.png
5756
- docs/colors/schemes/discrete/**/*.svg
@@ -65,7 +64,6 @@ extra-doc-files:
6564
- docs/penrose/**/*.svg
6665
- docs/physics/**/*.svg
6766
- docs/plotting/**/*.svg
68-
- docs/sampling/**/*.svg
6967
- docs/triangulation/**/*.svg
7068

7169
ghc-options:

0 commit comments

Comments
 (0)