diff --git a/dist/index.js b/dist/index.js index db391465..6cb338ee 100644 --- a/dist/index.js +++ b/dist/index.js @@ -138068,6 +138068,7 @@ const CYGWIN_MIRROR_ENCODED_URI = encodeURIComponent(CYGWIN_MIRROR).toLowerCase( // [HACK] https://github.com/ocaml/setup-ocaml/pull/55 const CYGWIN_ROOT = external_node_path_namespaceObject.join("D:", "cygwin"); const CYGWIN_ROOT_BIN = external_node_path_namespaceObject.join(CYGWIN_ROOT, "bin"); +const CYGWIN_ROOT_MINGW_BIN = external_node_path_namespaceObject.join(CYGWIN_ROOT, "usr", "x86_64-w64-mingw32", "bin"); const DUNE_CACHE_ROOT = (() => { const homeDir = external_node_os_.homedir(); if (PLATFORM === "windows") { @@ -157245,6 +157246,7 @@ async function installer() { await saveCygwinCache(); } lib_core.addPath(CYGWIN_ROOT_BIN); + lib_core.addPath(CYGWIN_ROOT_MINGW_BIN); } await setupOpam(); await repositoryRemoveAll(); diff --git a/dist/post/index.js b/dist/post/index.js index 98316153..ef93686d 100644 --- a/dist/post/index.js +++ b/dist/post/index.js @@ -103597,6 +103597,7 @@ const constants_CYGWIN_MIRROR_ENCODED_URI = encodeURIComponent(CYGWIN_MIRROR).to // [HACK] https://github.com/ocaml/setup-ocaml/pull/55 const constants_CYGWIN_ROOT = external_node_path_namespaceObject.join("D:", "cygwin"); const CYGWIN_ROOT_BIN = external_node_path_namespaceObject.join(constants_CYGWIN_ROOT, "bin"); +const CYGWIN_ROOT_MINGW_BIN = external_node_path_namespaceObject.join(constants_CYGWIN_ROOT, "usr", "x86_64-w64-mingw32", "bin"); const DUNE_CACHE_ROOT = (() => { const homeDir = external_node_os_.homedir(); if (constants_PLATFORM === "windows") { diff --git a/packages/setup-ocaml/src/constants.ts b/packages/setup-ocaml/src/constants.ts index 3886f9cb..f1403c76 100644 --- a/packages/setup-ocaml/src/constants.ts +++ b/packages/setup-ocaml/src/constants.ts @@ -60,6 +60,13 @@ export const CYGWIN_ROOT = path.join("D:", "cygwin"); export const CYGWIN_ROOT_BIN = path.join(CYGWIN_ROOT, "bin"); +export const CYGWIN_ROOT_MINGW_BIN = path.join( + CYGWIN_ROOT, + "usr", + "x86_64-w64-mingw32", + "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 index 9f38d94a..29759fa2 100644 --- a/packages/setup-ocaml/src/installer.ts +++ b/packages/setup-ocaml/src/installer.ts @@ -10,6 +10,7 @@ import { } from "./cache.js"; import { CYGWIN_ROOT_BIN, + CYGWIN_ROOT_MINGW_BIN, DUNE_CACHE, DUNE_CACHE_ROOT, OPAM_PIN, @@ -67,6 +68,7 @@ export async function installer() { await saveCygwinCache(); } core.addPath(CYGWIN_ROOT_BIN); + core.addPath(CYGWIN_ROOT_MINGW_BIN); } await setupOpam(); await repositoryRemoveAll();