Refactor Dune_engine.Targets #9407
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
snowleopard
approved these changes
Dec 11, 2023
rgrinberg
force-pushed
the
refactor-targets
branch
3 times, most recently
from
faa0d18
to
46011a8
Compare
rgrinberg
approved these changes
Dec 12, 2023
There was a problem hiding this comment.
I've replaced the use of symlinking to create a directory target with just normal copying as an experiment and it didn't seem to help. I've also experimented with sandboxing to make sure that we specified all dependencies correctly and again without success.
The fact that doing a clean build gives us the right answer in the install rules is rather concerning and my first assumption is that there's some bug in the engine.
Unfortunately, I didn't get anywhere investigating. I'll keep investigating, but I don't think this should block the PR.
I've left a commit (which I later reverted) switching the symlinking to copying in case anyone wants to experiment.
rleshchinskiy
force-pushed
the
refactor-targets
branch
from
8982e81
to
e5c880e
Compare
We had similar but subtly different code for sandboxed and non-sandboxed directory targets. This patch unifies the two. We also no longer promote empty (sub)directories. Previously, this was only the case for sandboxed directory targets because we didn't move empty (sub)directories from the sandbox to the build dir. Signed-off-by: Roman Leshchinskiy <rleshchinskiy@janestreet.com>
There was some code duplication here which gets in the way of subsequent refactoring. Let's get rid of it. Signed-off-by: Roman Leshchinskiy <rleshchinskiy@janestreet.com>
This is a pure refactoring. The main goal is to be able to move Dune_engine.Targets into a separate package which can be used from dune_cache. However, I believe that it also makes the code simpler to follow overall. The main change is that we move everything to do with async file operations into Build_system which really is the only user of those, anyway. In addition, we also slightly generalise [Targets.Produced.collect_digests] and remove an unused pretty-printing function. Signed-off-by: Roman Leshchinskiy <rleshchinskiy@janestreet.com>
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
This reverts commit 46011a8. Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
rleshchinskiy
force-pushed
the
refactor-targets
branch
from
e5c880e
to
92e776f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a bunch of refactoring around
Targetsand especiallyTargets.Produced. The main changes are:Targets.Produced.collect_digestswhich allows us to removeTargets.Produced.Option.Build_systemwhich really is the only user of those, anyway.Dune_enginefromTargets. A later PR will move those into a separate library which will allow us to use them in the cache as well.