CYGWIN_ROOT_BIN

Signed-off-by: Sora Morimoto <[email protected]>
ocaml · Jun 14, 2024 · 6dd4ee6 · 6dd4ee6
1 parent f11536f
commit 6dd4ee6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 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
@@ -52,6 +52,8 @@ export const CYGWIN_MIRROR = "https://cygwin.mirror.constant.com/";
 // [HACK] https://github.com/ocaml/setup-ocaml/pull/55
 export const CYGWIN_ROOT = path.join("D:", "cygwin");
 
+export const CYGWIN_ROOT_BIN = path.join(CYGWIN_ROOT, "bin");
+
 export const DUNE_CACHE_ROOT = (() => {
   const homeDir = os.homedir();
   if (PLATFORM === "windows") {

diff --git a/packages/setup-ocaml/src/installer.ts b/packages/setup-ocaml/src/installer.ts
@@ -9,6 +9,7 @@ import {
   saveOpamCache,
 } from "./cache.js";
 import {
+  CYGWIN_ROOT_BIN,
   DUNE_CACHE,
   DUNE_CACHE_ROOT,
   OCAML_COMPILER,
@@ -62,9 +63,12 @@ export async function installer() {
     );
   }
   const { opamCacheHit, cygwinCacheHit } = await restoreOpamCaches();
-  if (!cygwinCacheHit && PLATFORM === "windows") {
-    await setupCygwin();
-    await saveCygwinCache();
+  if (PLATFORM === "windows") {
+    if (!cygwinCacheHit) {
+      await setupCygwin();
+      await saveCygwinCache();
+    }
+    core.addPath(CYGWIN_ROOT_BIN);
   }
   await setupOpam();
   await repositoryRemoveAll();