Merge pull request #908 from ocaml/fix-dune-cache-root-win

Fix DUNE_CACHE_ROOT on Windows
ocaml · Dec 5, 2024 · 2760130 · 2760130
2 parents 9c8cce0 + a20edc7
commit 2760130
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/post/index.js b/dist/post/index.js
diff --git a/packages/setup-ocaml/src/constants.ts b/packages/setup-ocaml/src/constants.ts
@@ -62,15 +62,13 @@ export const CYGWIN_ROOT_BIN = path.join(CYGWIN_ROOT, "bin");
 
 export const DUNE_CACHE_ROOT = (() => {
   const homeDir = os.homedir();
-  if (PLATFORM === "windows") {
-    // [HACK] https://github.com/ocaml/setup-ocaml/pull/55
-    const duneCacheDir = path.join("D:", "dune");
-    return duneCacheDir;
-  }
   const xdgCacheHome = process.env.XDG_CACHE_HOME;
   const duneCacheDir = xdgCacheHome
     ? path.join(xdgCacheHome, "dune")
-    : path.join(homeDir, ".cache", "dune");
+    : PLATFORM === "windows"
+      ? // [HACK] https://github.com/ocaml/setup-ocaml/pull/55
+        path.join("D:", "dune")
+      : path.join(homeDir, ".cache", "dune");
   return duneCacheDir;
 })();