-
Notifications
You must be signed in to change notification settings - Fork 691
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
haddock-project fixes (backport #8919) #9088
Conversation
This patch fixes a bug where a sublibrary overwrites a library directory. This leads to overwriting `*.haddock` files, which results in missing entries in various indexes (e.g. the html index, quicksearch). (cherry picked from commit 1840bca) # Conflicts: # cabal-install/src/Distribution/Client/CmdHaddockProject.hs
This patch makes `haddock-project` use `--local` option by default. Since its the default, it is removed. Also `--gen-index`, `--gen-contents`, `--hyperlinked-source` and `--quickjump` are removed since they are always turned on. Added a haddock-project test. (cherry picked from commit 1b89c1b) # Conflicts: # Cabal/src/Distribution/Simple/Haddock.hs # Cabal/src/Distribution/Simple/Setup/Haddock.hs # cabal-install/src/Distribution/Client/CmdHaddockProject.hs # cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.cabal.out # cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.out # cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out # cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-explicit.out # cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.cabal.out # cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.out # cabal-testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out # cabal-testsuite/PackageTests/Backpack/Reexport1/setup.out # cabal-testsuite/PackageTests/Haddock/setup.cabal.out # cabal-testsuite/PackageTests/Haddock/setup.out # cabal-testsuite/PackageTests/HaddockArgs/quickjump.out # cabal-testsuite/PackageTests/HaddockNewline/setup.cabal.out # cabal-testsuite/PackageTests/HaddockNewline/setup.out # cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.cabal.out # cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.out # cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out # cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out # cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out # cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out
Needs manual rebase because of reformatting I assume. Cc @Kleidukos |
hmm, so it seems, thank you. |
cfffb5a
to
8672c6e
Compare
8672c6e
to
f9ca706
Compare
I'm getting a validate error that seems like it should be unrelated? Probably someone else should try this since I'm flying blind.
|
I switched to |
Any (partial) progress here? Any experiments that failed? |
cc @coot as you can see it's apparently more complex than what we thought |
Shall this be closed due to #9213 being merged? |
yes |
This is an automatic backport of pull request #8919 done by Mergify.
Cherry-pick of 1840bca has failed:
Cherry-pick of 1b89c1b has failed:
Cherry-pick of 2c597e8 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com