mirror of
https://github.com/xmonad/xmonad.git
synced 2025-05-19 08:30:21 -07:00
ci: Fix docs tarball
haskell-ci by default passes --haddock-all to cabal v2-haddock, which builds docs for all components and the …-docs.tar.gz tarball ends up containing the docs for the last component, which happens to be tests. We need the tarball to contain the library docs, for upload to Hackage. Fixes: 25a4ed69da9c ("ci: Bump haskell-ci")
This commit is contained in:
parent
4931bc4e41
commit
dd1e02555e
4
.github/workflows/haskell-ci-hackage.patch
vendored
4
.github/workflows/haskell-ci-hackage.patch
vendored
@ -49,8 +49,8 @@ set in GitHub repository secrets.
|
||||
${CABAL} -vnormal check
|
||||
- name: haddock
|
||||
run: |
|
||||
- $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
|
||||
+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH --haddock-for-hackage --builddir $GITHUB_WORKSPACE/haddock all
|
||||
- $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
|
||||
+ $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH --haddock-for-hackage --builddir $GITHUB_WORKSPACE/haddock all
|
||||
- name: unconstrained build
|
||||
run: |
|
||||
rm -f cabal.project.local
|
||||
|
2
.github/workflows/haskell-ci.yml
vendored
2
.github/workflows/haskell-ci.yml
vendored
@ -239,7 +239,7 @@ jobs:
|
||||
${CABAL} -vnormal check
|
||||
- name: haddock
|
||||
run: |
|
||||
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH --haddock-for-hackage --builddir $GITHUB_WORKSPACE/haddock all
|
||||
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH --haddock-for-hackage --builddir $GITHUB_WORKSPACE/haddock all
|
||||
- name: unconstrained build
|
||||
run: |
|
||||
rm -f cabal.project.local
|
||||
|
@ -12,3 +12,6 @@ raw-project
|
||||
optimization: False
|
||||
package xmonad
|
||||
flags: +pedantic
|
||||
|
||||
-- avoid --haddock-all which overwrites *-docs.tar.gz with tests docs
|
||||
haddock-components: libs
|
||||
|
Loading…
x
Reference in New Issue
Block a user