Skip to content

Commit 3428eb8

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request haskell#10535 from haskell/mergify/bp/3.14/pr-10507
Backport haskell#10507: Print out which project file we're using by default (fix haskell#8519)
2 parents c7abe0a + 53bf6b2 commit 3428eb8

File tree

177 files changed

+789
-9
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+789
-9
lines changed

‎cabal-install/src/Distribution/Client/ProjectPlanning.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@ rebuildProjectConfig
396396

397397
sequence_
398398
[ do
399-
info verbosity . render . vcat $
400-
text "this build was affected by the following (project) config files:"
399+
notice verbosity . render . vcat $
400+
text "Configuration is affected by the following files:"
401401
: [text "-" <+> docProjectConfigPath path]
402402
| Explicit path <- Set.toList $ projectConfigProvenance projectConfig
403403
]

‎cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.external.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.external.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.internal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.internal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes2/cov.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal test
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.external.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.internal.project
24
Resolving dependencies...
35
Build profile: -w ghc-<GHCVER> -O1
46
In order, the following will be built:
@@ -18,8 +20,7 @@ Configuring library 'indef' instantiated with
1820
Data.Map = containers-<VERSION>:Data.Map
1921
for I-0.1.0.0...
2022
Preprocessing library 'indef' for I-0.1.0.0...
21-
Building library 'indef' instantiated with
22-
Data.Map = containers-<VERSION>:Data.Map
23+
Building library 'indef' instantiated with Data.Map = containers-<VERSION>:Data.Map
2324
for I-0.1.0.0...
2425
Configuring executable 'exe' for I-0.1.0.0...
2526
Preprocessing executable 'exe' for I-0.1.0.0...

‎cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# cabal v2-update
2+
Configuration is affected by the following files:
3+
- cabal.repo.project
24
Downloading the latest package list from test-local-repo
35
# cabal v2-build
6+
Configuration is affected by the following files:
7+
- cabal.repo.project
48
Resolving dependencies...
59
Build profile: -w ghc-<GHCVER> -O1
610
In order, the following will be built:

‎cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# cabal v2-build
2+
Configuration is affected by the following files:
3+
- cabal.project
24
Resolving dependencies...
35
Error:
46
Problem with module re-exports:

0 commit comments

Comments
 (0)