faster win setup

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

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/packages/setup-ocaml/src/installer.ts b/packages/setup-ocaml/src/installer.ts
@@ -31,6 +31,15 @@ import { getOpamLocalPackages } from "./packages.js";
 import { resolveCompiler } from "./version.js";
 import { setupCygwin } from "./windows.js";
 
+async function restoreOpamCaches() {
+  const [opamCacheHit, cygwinCacheHit] = await Promise.all(
+    PLATFORM === "windows"
+      ? [restoreOpamCache(), restoreCygwinCache()]
+      : [restoreOpamCache()],
+  );
+  return { opamCacheHit, cygwinCacheHit };
+}
+
 export async function installer() {
   if (core.isDebug()) {
     core.exportVariable("OPAMVERBOSE", 1);
@@ -58,13 +67,12 @@ export async function installer() {
       ]);
       await exec("fsutil", ["behavior", "query", "SymlinkEvaluation"]);
     });
-    const cygwinCacheHit = await restoreCygwinCache();
-    if (!cygwinCacheHit) {
-      await setupCygwin();
-      await saveCygwinCache();
-    }
   }
-  const opamCacheHit = await restoreOpamCache();
+  const { opamCacheHit, cygwinCacheHit } = await restoreOpamCaches();
+  if (!cygwinCacheHit && PLATFORM === "windows") {
+    await setupCygwin();
+    await saveCygwinCache();
+  }
   await setupOpam();
   await repositoryRemoveAll();
   await repositoryAddAll(OPAM_REPOSITORIES);