Skip to content

Avoid using duplicate global config not adding it in the dummy project context #7753

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

Merged
merged 6 commits into from
Oct 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cabal-install/src/Distribution/Client/CmdRepl.hs
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ replCommand = Client.installCommand {
replAction :: NixStyleFlags (ReplOptions, EnvFlags) -> [String] -> GlobalFlags -> IO ()
replAction flags@NixStyleFlags { extraFlags = (replFlags, envFlags), ..} targetStrings globalFlags = do
let
with = withProject cliConfig verbosity targetStrings
without config = withoutProject (config <> cliConfig) verbosity targetStrings
with = withProject cliConfig verbosity targetStrings
without globalConfig = withoutProject (globalConfig <> cliConfig) verbosity targetStrings

(baseCtx, targetSelectors, finalizer, replType) <-
withProjectOrGlobalConfig verbosity ignoreProject globalConfigFlag with without
Expand Down
6 changes: 3 additions & 3 deletions cabal-install/src/Distribution/Client/CmdRun.hs
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ runAction flags@NixStyleFlags {..} targetStrings globalFlags = do
let
with =
establishProjectBaseContext verbosity cliConfig OtherCommand
without config = do
distDirLayout <- establishDummyDistDirLayout verbosity (config <> cliConfig) tmpDir
establishDummyProjectBaseContext verbosity (config <> cliConfig) distDirLayout [] OtherCommand
without globalConfig = do
distDirLayout <- establishDummyDistDirLayout verbosity (globalConfig <> cliConfig) tmpDir
establishDummyProjectBaseContext verbosity (globalConfig <> cliConfig) distDirLayout [] OtherCommand

baseCtx <- withProjectOrGlobalConfig verbosity ignoreProject globalConfigFlag with without

Expand Down
10 changes: 2 additions & 8 deletions cabal-install/src/Distribution/Client/ProjectOrchestration.hs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ import qualified Distribution.Client.ProjectPlanning as ProjectPlanning
import Distribution.Client.ProjectPlanning.Types
import Distribution.Client.ProjectBuilding
import Distribution.Client.ProjectPlanOutput
import Distribution.Client.RebuildMonad ( runRebuild )

import Distribution.Client.TargetProblem
( TargetProblem (..) )
Expand Down Expand Up @@ -1305,21 +1304,16 @@ data BuildFailurePresentation =
establishDummyProjectBaseContext
:: Verbosity
-> ProjectConfig
-- ^ Project configuration including the global config if needed
-> DistDirLayout
-- ^ Where to put the dist directory
-> [PackageSpecifier UnresolvedSourcePackage]
-- ^ The packages to be included in the project
-> CurrentCommand
-> IO ProjectBaseContext
establishDummyProjectBaseContext verbosity cliConfig distDirLayout localPackages currentCommand = do
establishDummyProjectBaseContext verbosity projectConfig distDirLayout localPackages currentCommand = do
cabalDir <- getCabalDir

globalConfig <- runRebuild ""
$ readGlobalConfig verbosity
$ projectConfigConfigFile
$ projectConfigShared cliConfig
let projectConfig = globalConfig <> cliConfig

let ProjectConfigBuildOnly {
projectConfigLogsDir
} = projectConfigBuildOnly projectConfig
Expand Down
6 changes: 3 additions & 3 deletions cabal-testsuite/PackageTests/Regression/T6906/cabal.test.hs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Test.Cabal.Prelude

main = cabalTest $ do
res <- cabalG' ["--config=cabal.config"] "v2-install" ["-v3"]
res <- recordMode DoNotRecord $ cabalG' ["--config=cabal.config"] "v2-install" ["-v3"]
assertOutputContains "creating file with the inputs used to compute the package hash:" res
assertOutputContains "extra-lib-dirs: bar" res
expectBroken 6906 $ assertOutputDoesNotContain "extra-lib-dirs: bar bar" res
assertOutputDoesNotContain "extra-lib-dirs: bar bar" res
assertOutputContains "extra-include-dirs: foo" res
expectBroken 6906 $ assertOutputDoesNotContain "extra-include-dirs: foo foo" res
assertOutputDoesNotContain "extra-include-dirs: foo foo" res
4 changes: 4 additions & 0 deletions changelog.d/issue-6906
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
synopsis: cabal v2 commands (install, repl, run) uses duplicate global config and rebuilds libs twice in the store
packages: cabal-install
issues: #6907
prs: #7753 #7759