sandbox: respect the DUNE_CACHE_ROOT environment variable if it exists

Signed-off-by: Sora Morimoto <[email protected]>
ocaml · Dec 6, 2024 · 400b2f6 · 400b2f6
1 parent 75f9eec
commit 400b2f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -85,6 +85,7 @@ users)
 ## Format upgrade
 
 ## Sandbox
+  * Respect the `DUNE_CACHE_ROOT` environment variable if it exists [#6326 @smorimoto]
 
 ## VCS
 

diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh
@@ -95,7 +95,7 @@ add_ccache_mount() {
 }
 
 add_dune_cache_mount() {
-  local dune_cache=${XDG_CACHE_HOME:-$HOME/.cache}/dune
+  local dune_cache=${DUNE_CACHE_ROOT:-${XDG_CACHE_HOME:-$HOME/.cache}/dune}
   mount_linked_cache "$dune_cache"
 }
 

diff --git a/src/state/shellscripts/sandbox_exec.sh b/src/state/shellscripts/sandbox_exec.sh
@@ -51,7 +51,7 @@ add_ccache_mount() {
 }
 
 add_dune_cache_mount() {
-  local dune_cache=${XDG_CACHE_HOME:-$HOME/.cache}/dune
+  local dune_cache=${DUNE_CACHE_ROOT:-${XDG_CACHE_HOME:-$HOME/.cache}/dune}
   mkdir -p "${dune_cache}"
   add_mounts rw "$dune_cache"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,6 +85,7 @@ users) @@
     ## Format upgrade
     ## Sandbox
+      * Respect the `DUNE_CACHE_ROOT` environment variable if it exists [#6326 @smorimoto]
     ## VCS
@@ Expand Down @@