Use separate opam cache for msys2 installs

tobil4sk · Sep 5, 2024 · 27a0374 · 27a0374
1 parent 210ca9a
commit 27a0374
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 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/cache.ts b/packages/setup-ocaml/src/cache.ts
@@ -50,6 +50,7 @@ async function composeOpamCacheKeys() {
   const ocamlCompiler = await RESOLVED_COMPILER;
   const repositoryUrls = OPAM_REPOSITORIES.map(([_, value]) => value).join(",");
   const osInfo = await system.osInfo();
+  const msys2 = WINDOWS_ENVIRONMENT === "msys2" ? "msys2" : undefined;
   const plainKey = [
     PLATFORM,
     osInfo.release,
@@ -58,7 +59,9 @@ async function composeOpamCacheKeys() {
     ocamlCompiler,
     repositoryUrls,
     sandbox,
-  ].join(",");
+  ]
+    .concat(msys2 ?? [])
+    .join(",");
   const hash = crypto.createHash("sha256").update(plainKey).digest("hex");
   const key = `${CACHE_PREFIX}-setup-ocaml-opam-${hash}`;
   const restoreKeys = [key];