Skip to content

Commit f480193

Browse files
committed
Fix Cygwin installation path for Windows Server 2025
Signed-off-by: Sora Morimoto <sora@morimoto.io>
1 parent 4f34096 commit f480193

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ inputs:
3636
cache-prefix:
3737
description: The prefix of the cache keys.
3838
required: false
39-
default: v3
39+
default: v1
4040
github-token:
4141
description: DO NOT SET THIS.
4242
required: false

dist/index.cjs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/post/index.cjs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/setup-ocaml/src/constants.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ export const CYGWIN_MIRROR = "https://mirrors.kernel.org/sourceware/cygwin/";
5858

5959
export const GITHUB_WORKSPACE = process.env.GITHUB_WORKSPACE ?? process.cwd();
6060

61-
// [HACK] https://github.com/ocaml/setup-ocaml/pull/55
62-
export const CYGWIN_ROOT = path.join("D:", "cygwin");
61+
export const CYGWIN_ROOT = path.join("C:", "cygwin");
6362

6463
export const CYGWIN_ROOT_BIN = path.join(CYGWIN_ROOT, "bin");
6564

@@ -73,16 +72,14 @@ export const DUNE_CACHE_ROOT = (() => {
7372
return path.join(xdgCacheHome, "dune");
7473
}
7574
if (PLATFORM === "windows") {
76-
// [HACK] https://github.com/ocaml/setup-ocaml/pull/55
77-
return path.join("D:", "dune");
75+
return path.join("C:", "dune");
7876
}
7977
return path.join(os.homedir(), ".cache", "dune");
8078
})();
8179

8280
export const OPAM_ROOT = (() => {
8381
if (PLATFORM === "windows") {
84-
// [HACK] https://github.com/ocaml/setup-ocaml/pull/55
85-
return path.join("D:", ".opam");
82+
return path.join("C:", ".opam");
8683
}
8784
return path.join(os.homedir(), ".opam");
8885
})();

0 commit comments

Comments
 (0)