Merge pull request #890 from ocaml/better-opam-repo-handle

Faster set-up when a cache hit occurs
ocaml · Nov 9, 2024 · d071987 · d071987
2 parents 01a166b + d67a46f
commit d071987
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 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
@@ -25,6 +25,7 @@ import {
   repositoryAddAll,
   repositoryRemoveAll,
   setupOpam,
+  update,
 } from "./opam.js";
 import { retrieveOpamLocalPackages } from "./packages.js";
 import { setupCygwin } from "./windows.js";
@@ -69,12 +70,14 @@ export async function installer() {
     core.addPath(CYGWIN_ROOT_BIN);
   }
   await setupOpam();
-  await repositoryRemoveAll();
-  await repositoryAddAll(OPAM_REPOSITORIES);
-  const ocamlCompiler = await RESOLVED_COMPILER;
   if (!opamCacheHit) {
+    await repositoryRemoveAll();
+    await repositoryAddAll(OPAM_REPOSITORIES);
+    const ocamlCompiler = await RESOLVED_COMPILER;
     await installOcaml(ocamlCompiler);
     await saveOpamCache();
+  } else {
+    await update();
   }
   if (DUNE_CACHE) {
     await restoreDuneCache();

diff --git a/packages/setup-ocaml/src/opam.ts b/packages/setup-ocaml/src/opam.ts
@@ -194,3 +194,9 @@ export async function repositoryRemoveAll() {
     }
   });
 }
+
+export async function update() {
+  await core.group("Update the list of available opam packages", async () => {
+    await exec("opam", ["update"]);
+  });
+}