Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cygwin mingw bin directory to PATH #859

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/post/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions packages/setup-ocaml/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
2 changes: 2 additions & 0 deletions packages/setup-ocaml/src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
} from "./cache.js";
import {
CYGWIN_ROOT_BIN,
CYGWIN_ROOT_MINGW_BIN,
DUNE_CACHE,
DUNE_CACHE_ROOT,
OPAM_PIN,
Expand Down Expand Up @@ -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();
Expand Down