Clean cabal project #2097

jneira · 2021-08-15T15:01:38Z

Clean main cabal.project, removing the shake-bench submodule and all the allow-newer
Create a specific project for run the benchmarks with all the workaround needed for build it:
- All the allow-newer
- And the submodule shake-bench, which now is being built, with all dependencies in all builds (with or without benchs)

The idea is backport thia to 1.3.0-hackage to help the hackage release (#1990)

pepeiborra

How is shake-bench blocking the Hackage release? Please explain the issue and let's try to find a solution that doesn't introduce a new cabal-foo.project file.

pepeiborra · 2021-08-16T08:38:49Z

cabal-benchmark.project

+allow-newer:
+    diagrams-contrib:base,
+    diagrams-contrib:lens,
+    diagrams-contrib:random,
+    diagrams-core:base,
+    diagrams-core:lens,
+    diagrams-lib:base,
+    diagrams-lib:lens,
+    diagrams-postscript:base,
+    diagrams-postscript:lens,
+    diagrams-svg:base,
+    diagrams-svg:lens,
+    dual-tree:base,
+    svg-builder:base


Are these still needed though? The upstream issue was fixed recently: diagrams/diagrams-core#112

will try it

without the allow-newer for diagrams-core i got

PS D:\hls> cabal bench --project-file .\cabal-benchmark.project Resolving dependencies... cabal-3.4.0.0.exe: Could not resolve dependencies: [__0] trying: ghc-api-compat-8.6.1 (user goal) [__1] trying: base-4.14.2.0/installed-4.14.2.0 (dependency of ghc-api-compat) [__2] trying: shake-bench-0.1.0.0 (user goal) [__3] trying: diagrams-svg-1.4.3 (dependency of shake-bench) [__4] trying: diagrams-core-1.5.0 (dependency of diagrams-svg) [__5] next goal: Chart-diagrams (dependency of shake-bench) [__5] rejecting: Chart-diagrams-1.9.3 (conflict: diagrams-core==1.5.0, Chart-diagrams => diagrams-core>=1.3 && <1.5) [__5] skipping: Chart-diagrams-1.9.2, Chart-diagrams-1.9.1, Chart-diagrams-1.9, Chart-diagrams-1.8.3, Chart-diagrams-1.8.2, Chart-diagrams-1.8.1, Chart-diagrams-1.8, Chart-diagrams-1.7.1, Chart-diagrams-1.7, Chart-diagrams-1.6, Chart-diagrams-1.5.4, Chart-diagrams-1.5.1, Chart-diagrams-1.5, Chart-diagrams-1.4, Chart-diagrams-1.3.3, Chart-diagrams-1.3.2, Chart-diagrams-1.3.1, Chart-diagrams-1.3, Chart-diagrams-1.2.4, Chart-diagrams-1.2.3, Chart-diagrams-1.2.2, Chart-diagrams-1.2, Chart-diagrams-1.1, Chart-diagrams-1.0 (has the same characteristics that caused the previous version to fail: excludes 'diagrams-core' version 1.5.0) [__5] fail (backjumping, conflict set: Chart-diagrams, diagrams-core, shake-bench) After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: diagrams-core, base, Chart-diagrams, shake-bench, diagrams-svg, ghc-api-compat Try running with --minimize-conflict-set to improve the error message.

After trying several combinations i only get it to build enabling all of them maybe a more detailed analysis could make let us know the way to remove them.

I've got to remove some other entries from allow-newer

jneira · 2021-08-16T09:05:15Z

How is shake-bench blocking the Hackage release? Please explain the issue and let's try to find a solution that doesn't introduce a new cabal-foo.project file.

It is not blocking the release directly but disturbing it with bench only releated allow-newer and a submodule, which is being taken in account for all builds even if they are not running or building benchmarks.
Otoh that makes you cant run the benchmarks against the hackage released version of ghcide.
I can restore all the workarounds needed to run the benchmarks in the main cabal.project file (with comments of course, to no be confused with other reason to add allow-newer), but i thought separate it would be a good motivation to try to remove the workarounds, which are since long time ago and seems to stay with us forever.

jneira · 2021-08-16T13:32:51Z

@pepeiborra ok, i've unified both cabal*.project again. Only would like to have some issue or plan to eventually remove the allow-newer i've not removed in this pr.

jneira · 2021-08-16T13:34:59Z

@Mergifyio backport 1.3.0-hackage

mergify · 2021-08-16T13:35:32Z

Command backport 1.3.0-hackage: pending

Waiting for the pull request to get merged

pepeiborra · 2021-08-16T15:39:17Z

The allow-newer for all the diagrams ecosystem should not be needed anymore, did you check?

pepeiborra · 2021-08-16T15:42:01Z

How is shake-bench blocking the Hackage release? Please explain the issue and let's try to find a solution that doesn't introduce a new cabal-foo.project file.

It is not blocking the release directly but disturbing it with bench only releated allow-newer and a submodule, which is being taken in account for all builds even if they are not running or building benchmarks.

The allow-newer might be superfluous, let's find out.

To avoid building shake-bench, just be more precise and list the targets that you wish to build: "cabal build haskell-language-server"

Otoh that makes you cant run the benchmarks against the hackage released version of ghcide.

Not sure what you mean. Care to elaborate,

I can restore all the workarounds needed to run the benchmarks in the main cabal.project file (with comments of course, to no be confused with other reason to add allow-newer), but i thought separate it would be a good motivation to try to remove the workarounds, which are since long time ago and seems to stay with us forever.

What workarounds are you referring to?

jneira · 2021-08-16T16:52:04Z

The allow-newer for all the diagrams ecosystem should not be needed anymore, did you check?

yeah, see #2097 (comment)

jneira · 2021-08-16T16:55:18Z

To avoid building shake-bench, just be more precise and list the targets that you wish to build: "cabal build haskell-language-server\

in my tests, no matter if you set a specific target or use --disable-benchmarks shake-bench is taken in account to compute the build plan, so it makes all builds fail if cabal does not find a plan including it

jneira · 2021-08-16T16:56:32Z

Not sure what you mean. Care to elaborate,

due to allow-never you can't run the benchmarks downloading the package(s) from hackage

jneira · 2021-08-16T16:57:35Z

What workarounds are you referring to?

for me allow-newer and remote source repo packages in cabal.project are workarounds to be removed asap

pepeiborra · 2021-08-16T21:18:10Z

To avoid building shake-bench, just be more precise and list the targets that you wish to build: "cabal build haskell-language-server\

in my tests, no matter if you set a specific target or use --disable-benchmarks shake-bench is taken in account to compute the build plan, so it makes all builds fail if cabal does not find a plan including it

Understood. I have opened #2101 to remove as many as possible, there are still 2 left.

* Remove superflous things * Set index-state * Add ghc-api-compat and remove shake-bench * Correct comment about ghc-api-compat * Add specific project file for benchs * Use specific project file for benchmarks * Ensure we use lsp-1.3.0.1 * Use lsp-types-1.3.0.1 for stack * Use lsp-types-1.3.0.1 for default stack * Remove some more allow-newer * Use one cabal.project Co-authored-by: Pepe Iborra <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 57ffd74) # Conflicts: # cabal.project

mergify · 2021-08-18T06:00:30Z

Command backport 1.3.0-hackage: success

Backports have been created

#2110 Clean cabal project (backport #2097) has been created for branch 1.3.0-hackage

* Clean cabal project (#2097) * Remove superflous things * Set index-state * Add ghc-api-compat and remove shake-bench * Correct comment about ghc-api-compat * Add specific project file for benchs * Use specific project file for benchmarks * Ensure we use lsp-1.3.0.1 * Use lsp-types-1.3.0.1 for stack * Use lsp-types-1.3.0.1 for default stack * Remove some more allow-newer * Use one cabal.project Co-authored-by: Pepe Iborra <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 57ffd74) # Conflicts: # cabal.project * Resolve conflicts Co-authored-by: Javier Neira <[email protected]>

* Remove superflous things * Set index-state * Add ghc-api-compat and remove shake-bench * Correct comment about ghc-api-compat * Add specific project file for benchs * Use specific project file for benchmarks * Ensure we use lsp-1.3.0.1 * Use lsp-types-1.3.0.1 for stack * Use lsp-types-1.3.0.1 for default stack * Remove some more allow-newer * Use one cabal.project Co-authored-by: Pepe Iborra <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 57ffd74)

jneira requested a review from pepeiborra August 15, 2021 15:01

pepeiborra reviewed Aug 16, 2021

View reviewed changes

jneira mentioned this pull request Aug 16, 2021

July 2021 monthly release (1.3.0) with limited ghc 9.0 support (needs hackage release) #1990

Closed

2 tasks

jneira added 11 commits August 17, 2021 16:35

Remove superflous things

c758eae

Set index-state

a7da94c

Add ghc-api-compat and remove shake-bench

e53c0f9

Correct comment about ghc-api-compat

0c9a26b

Add specific project file for benchs

a02992e

Use specific project file for benchmarks

3302bdf

Ensure we use lsp-1.3.0.1

07861e9

Use lsp-types-1.3.0.1 for stack

61d5395

Use lsp-types-1.3.0.1 for default stack

37048ce

Remove some more allow-newer

d62bd39

Use one cabal.project

19bb487

jneira force-pushed the clean-cabal-project branch from 7e7fbf3 to 19bb487 Compare August 17, 2021 14:39

jneira requested a review from pepeiborra August 17, 2021 19:51

jneira added the merge me Label to trigger pull request merge label Aug 17, 2021

pepeiborra approved these changes Aug 17, 2021

View reviewed changes

Merge branch 'master' into clean-cabal-project

4593b9c

Merge branch 'master' into clean-cabal-project

14411b5

mergify bot merged commit 57ffd74 into haskell:master Aug 18, 2021

mergify bot mentioned this pull request Aug 18, 2021

Clean cabal project (backport #2097) #2110

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean cabal project #2097

Clean cabal project #2097

jneira commented Aug 15, 2021 •

edited

Loading

pepeiborra left a comment •

edited

Loading

pepeiborra Aug 16, 2021

jneira Aug 16, 2021

jneira Aug 16, 2021

jneira Aug 16, 2021

jneira commented Aug 16, 2021

jneira commented Aug 16, 2021

jneira commented Aug 16, 2021

mergify bot commented Aug 16, 2021

pepeiborra commented Aug 16, 2021

pepeiborra commented Aug 16, 2021

jneira commented Aug 16, 2021

jneira commented Aug 16, 2021

jneira commented Aug 16, 2021 •

edited

Loading

jneira commented Aug 16, 2021

pepeiborra commented Aug 16, 2021

mergify bot commented Aug 18, 2021

Clean cabal project #2097

Clean cabal project #2097

Conversation

jneira commented Aug 15, 2021 • edited Loading

pepeiborra left a comment • edited Loading

Choose a reason for hiding this comment

pepeiborra Aug 16, 2021

Choose a reason for hiding this comment

jneira Aug 16, 2021

Choose a reason for hiding this comment

jneira Aug 16, 2021

Choose a reason for hiding this comment

jneira Aug 16, 2021

Choose a reason for hiding this comment

jneira commented Aug 16, 2021

jneira commented Aug 16, 2021

jneira commented Aug 16, 2021

mergify bot commented Aug 16, 2021

pepeiborra commented Aug 16, 2021

pepeiborra commented Aug 16, 2021

jneira commented Aug 16, 2021

jneira commented Aug 16, 2021

jneira commented Aug 16, 2021 • edited Loading

jneira commented Aug 16, 2021

pepeiborra commented Aug 16, 2021

mergify bot commented Aug 18, 2021

jneira commented Aug 15, 2021 •

edited

Loading

pepeiborra left a comment •

edited

Loading

jneira commented Aug 16, 2021 •

edited

Loading