Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2024

This commit initialises the Haddock flag haddockKeepTempFiles with the value of buildSettingKeepTempFiles.

The only change in the patch is the following, in setupHsHaddockFlags:

- haddockKeepTempFiles = mempty -- TODO: from build settings
+ haddockKeepTempFiles = toFlag keepTmpFiles

where keepTmpFiles is retrieved from BuildTimeSettings.

This addresses an 8 year old TODO in the code.

Template Α: This PR modifies behaviour or interface.

TODO:

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated.
  • Tests have been added.

This is an automatic backport of pull request #9966 done by [Mergify](https://mergify.com).

This commit initialises the Haddock flag haddockKeepTempFiles with the
value of buildSettingKeepTempFiles.

This addresses an 8 year old TODO in the code, from Duncan Coutts.

(cherry picked from commit e35c0dc)

# Conflicts:
#	cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs
#	cabal-install/src/Distribution/Client/ProjectPlanning.hs
@mergify mergify bot added the conflicts label Jun 6, 2024
Copy link
Contributor Author

mergify bot commented Jun 6, 2024

Cherry-pick of e35c0dc has failed:

On branch mergify/bp/3.12/pr-9966
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit e35c0dcca.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   cabal-testsuite/PackageTests/HaddockKeepsTmps/Simple.hs
	new file:   cabal-testsuite/PackageTests/HaddockKeepsTmps/cabal.project
	new file:   cabal-testsuite/PackageTests/HaddockKeepsTmps/cabal.test.hs
	new file:   cabal-testsuite/PackageTests/HaddockKeepsTmps/my.cabal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs
	both modified:   cabal-install/src/Distribution/Client/ProjectPlanning.hs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jun 6, 2024
4 tasks
@mergify mergify bot added the backport label Jun 6, 2024
@ulysses4ever
Copy link
Collaborator

It's not exactly a bugfix (arguably), and it seems to interact with other Haddock stuff that we decided not to backport, so let's backtrack here and not backport.

@mergify mergify bot deleted the mergify/bp/3.12/pr-9966 branch June 6, 2024 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants