Skip to content

Commit 18c963e

Browse files
Prepare for multi-package repository. (#264)
2 parents 0ac869c + 5eae692 commit 18c963e

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: ${{ matrix.os }}-ghc-${{ matrix.ghc }}
1818
runs-on: ${{ matrix.os }}
1919
env:
20-
cabal-build-dir: b
20+
cabal-build-dir: dist-newstyle
2121
strategy:
2222
matrix:
2323
os:
@@ -105,22 +105,20 @@ jobs:
105105
|| true
106106
107107
- name: Documentation (Generation)
108+
if: |
109+
matrix.os == 'ubuntu-latest'
110+
&& matrix.ghc == '9.12'
108111
run: >
109-
cabal haddock
110-
--builddir=${{ env.cabal-build-dir }}
111-
--enable-documentation
112-
--haddock-hyperlink-source
113-
--haddock-html-location
114-
'https://hackage.haskell.org/package/$pkg-$version/docs'
112+
cabal haddock-project
113+
--hackage
114+
--output=gh-pages
115115
116116
- name: Documentation (Staging)
117117
if: |
118118
github.ref == 'refs/heads/main'
119119
&& matrix.os == 'ubuntu-latest'
120120
&& matrix.ghc == '9.12'
121121
run: >
122-
mv ${{ env.cabal-build-dir }}/build/*/*/*/doc/html/* gh-pages
123-
124122
touch gh-pages/.nojekyll
125123
126124
- name: Documentation (Deployment)

cabal.project

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
packages: monoidmap.cabal
1+
packages:
2+
packages/*
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)