Skip to content
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.

Sign up for GitHub

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

Jump to bottom

New build plan construction with source maps #4412

Merged
merged 40 commits into from
Dec 20, 2018
Merged

New build plan construction with source maps #4412

merged 40 commits into from
Dec 20, 2018

Conversation

qrilka
Copy link
Contributor

@qrilka qrilka commented Nov 21, 2018

Please include the following checklist in your PR:

  • Any changes that could be relevant to users have been recorded in the ChangeLog.md
  • The documentation has been updated, if necessary.

The PR implements what is described in https://github.com/commercialhaskell/stack/blob/master/doc/build-overview.md

2 integration tests fail currently, both involve stack solver which is to be fixed in #4410

Fixes #3922

snoyberg and others added 30 commits September 15, 2018 19:50
@snoyberg
Initial gameplan for new build plan construction
8037256
@qrilka
Made project compile, SMWanted created in loadBuildConfig
f84a62b
@qrilka
Parse SMTargets, loadSourceMap' using it
b60ac4a
@qrilka
Migrated to "pure" SourceMap (with no cabal files loaded)
b7f4310
@qrilka
Construct build plan from SourceMap
0487fd2
@qrilka
Returned back tellExecutablesUpstream
e9d34bf
@qrilka
Proper build command
00947fc
@qrilka
SourceMap instead of SMActual in EnvConfig
7a4b51a
@qrilka
Partial ghci fix
9795649
@qrilka
Source code cleanup
6ddbfc0
@qrilka
fix freeze command
69e2307
@qrilka
Fix script command removing loadedSnapshotL
bb76969
@qrilka
Merge branch 'master' into new-build-plan
a0d2857
@qrilka
Source code cleanup
2acc89f
@qrilka
Proper setting of GHC options
b18b326
@qrilka
Source code cleanup
aef17c1
@qrilka
Only 1 buildOptsCLI should be used (hack in withNewLocalBuildTargets)
3260668
@qrilka
Proper source map hash
6d57ab5
@qrilka
Incorporate haddock building flag into source map and use it for hash
dfab51e
@qrilka
source map hash calculated ones, versions from pantry data
37bf9d6
@qrilka
Fix test 2643-copy-compiler-tool: use per package flag
07f37e0
@qrilka
overridable global packages as build plan sources
d0b757d
@qrilka
Fix tests for issue 617 (error messages for incorrect flags)
458382c
@qrilka
Enable back tests during tarball test build
23590f0
@qrilka
Fill empty hackage index when getting package versions
81a1e97
@qrilka
General GHC options get prepended and don't override existing ones
7fffb35
@qrilka
Return back ignoring dependency bounds between snapshots packages
eac9d99
@qrilka
Merge branch 'master' into new-build-plan
cd408cc
@qrilka
Hlint fixes
732dff7
@qrilka
Global packages from global hints when local GHC wasn't determined
45d79a7
@qrilka
Copy link
Contributor Author

qrilka commented Dec 4, 2018

@lehins I've changed TTRemote into TTRemotePackage, sounds OK?

@lehins
Copy link
Contributor

lehins commented Dec 4, 2018

@qrilka Yeah, sounds good to me.

@qrilka qrilka mentioned this pull request Dec 4, 2018
Open
lehins
lehins reviewed Dec 11, 2018
View reviewed changes
src/Stack/Build/Source.hs Outdated Show resolved Hide resolved
lehins
lehins reviewed Dec 11, 2018
View reviewed changes
src/Stack/Types/Config.hs Outdated Show resolved Hide resolved
lehins
lehins reviewed Dec 11, 2018
View reviewed changes
src/Stack/SourceMap.hs Outdated Show resolved Hide resolved
lehins
lehins reviewed Dec 11, 2018
View reviewed changes
src/Stack/SourceMap.hs Outdated Show resolved Hide resolved
lehins
lehins reviewed Dec 11, 2018
View reviewed changes
src/Stack/Script.hs Outdated Show resolved Hide resolved
lehins
lehins reviewed Dec 12, 2018
View reviewed changes
src/Stack/Hoogle.hs Outdated Show resolved Hide resolved
lehins
lehins reviewed Dec 12, 2018
View reviewed changes
src/Stack/Hoogle.hs Outdated Show resolved Hide resolved
@lehins
Copy link
Contributor

lehins commented Dec 12, 2018

@qrilka There seems to be a conflict with src/Stack/Config.hs otherwise this PR looks good to me.

@qrilka
Copy link
Contributor Author

qrilka commented Dec 13, 2018

Conflict resolved

@qrilka qrilka mentioned this pull request Dec 13, 2018
Open
@qrilka
Copy link
Contributor Author

qrilka commented Dec 20, 2018

With a new merge with master pantry tests don't fail because of Mercurial but builds appear to time out.
Local integration tests show 2 fails: 3397-ghc-solver and 3533-extra-deps-solver - both are supposed to get resolved in #4410

@qrilka qrilka merged commit 1bbed48 into master Dec 20, 2018
@qrilka qrilka mentioned this pull request Jan 4, 2019
Closed
@qrilka qrilka mentioned this pull request Jan 22, 2019
Merged
2 tasks
@mihaimaruseac mihaimaruseac deleted the new-build-plan branch January 22, 2019 14:49
@qrilka qrilka mentioned this pull request Mar 12, 2019
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lehins lehins lehins left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Better calculation of SourceMap/buildplans (improves cache as well)
3 participants
@qrilka @lehins @snoyberg