Toolchain cache: use DUNE_CACHE_ROOT instead of XDG_CACHE_HOME #11612
Conversation
This file contains hidden or 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
Signed-off-by: Ambre Austen Suhamy <[email protected]>
Signed-off-by: Ambre Austen Suhamy <[email protected]>
ElectreAAS
commented
Apr 7, 2025
| @@ -21,7 +21,7 @@ val is_compiler_and_toolchains_enabled : Package.Name.t -> bool | |||
|
|
|||
| (** Returns the path to the directory containing the given package within the | |||
| toolchain directory. This will be something like | |||
| $XDG_CACHE_DIR/dune/toolchains/ocaml-base-compiler.5.2.1.XXXXXXXX where | |||
There was a problem hiding this comment.
Note that this was a typo, it's XDG_CACHE_HOME, not DIR
gridbugs
reviewed
Apr 8, 2025
| (Path.of_string (Xdg.cache_dir (Lazy.force Dune_util.xdg))) | ||
| [ "dune"; "git-repo" ] | ||
| in | ||
| let dir = Path.L.relative Dune_cache_storage.Layout.root_dir [ "dune"; "git-repo" ] in |
There was a problem hiding this comment.
Does Dune_cache_storage.Layout.root_dir return the contents of $XDG_CACHE_HOME (or similar) if $DUNE_CACHE_ROOT is not set?
There was a problem hiding this comment.
Yes, it calls Xdg.cache_dir which is set from the env var
There was a problem hiding this comment.
Is this not adding one layer of dune too much? I would expect it to return ~/.cache/dune if the directory was not set thus it would be ~/.cache/dune/dune/git-repo in the case where DUNE_CACHE_ROOT is not set.
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.
Fixes #11584 and should ease the pain of #11585.
The cache is set up to be at
$DUNE_CACHE_ROOT, which itself will default on$XDG_CACHE_HOMEif not present. Two places skipped one step and use the XDG directly: the toolchain cache and the rev-store cache. This PR fixes both of these.