_

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

Hide file tree

Showing 5 changed files with 78 additions and 80 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -67,6 +67,5 @@ jobs:
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           allow-prerelease-opam: true
-          dune-cache: true
 
       - run: opam install uri
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
@@ -159,15 +159,40 @@ async function saveCache(key: string, paths: string[]) {
   }
 }
 
-export async function restoreCygwinCache() {
-  return await core.group("Retrieve the Cygwin cache", async () => {
-    const { key, restoreKeys } = await composeCygwinCacheKeys();
-    const paths = composeCygwinCachePaths();
+export async function restoreDuneCache() {
+  return await core.group("Retrieve the dune cache", async () => {
+    const { key, restoreKeys } = composeDuneCacheKeys();
+    const paths = composeDuneCachePaths();
     const cacheKey = await restoreCache(key, restoreKeys, paths);
     return cacheKey;
   });
 }
 
+async function restoreCygwinCache() {
+  const { key, restoreKeys } = await composeCygwinCacheKeys();
+  const paths = composeCygwinCachePaths();
+  const cacheKey = await restoreCache(key, restoreKeys, paths);
+  return cacheKey;
+}
+
+async function restoreOpamCache() {
+  const { key, restoreKeys } = await composeOpamCacheKeys();
+  const paths = composeOpamCachePaths();
+  const cacheKey = await restoreCache(key, restoreKeys, paths);
+  return cacheKey;
+}
+
+export async function restoreOpamCaches() {
+  return await core.group("Retrieve the opam cache", async () => {
+    const [opamCacheHit, cygwinCacheHit] = await Promise.all(
+      PLATFORM === "windows"
+        ? [restoreOpamCache(), restoreCygwinCache()]
+        : [restoreOpamCache()],
+    );
+    return { opamCacheHit, cygwinCacheHit };
+  });
+}
+
 export async function saveCygwinCache() {
   await core.group("Save the Cygwin cache", async () => {
     const { key } = await composeCygwinCacheKeys();
@@ -176,15 +201,6 @@ export async function saveCygwinCache() {
   });
 }
 
-export async function restoreDuneCache() {
-  return await core.group("Retrieve the dune cache", async () => {
-    const { key, restoreKeys } = composeDuneCacheKeys();
-    const paths = composeDuneCachePaths();
-    const cacheKey = await restoreCache(key, restoreKeys, paths);
-    return cacheKey;
-  });
-}
-
 export async function saveDuneCache() {
   await core.group("Save the dune cache", async () => {
     const { key } = composeDuneCacheKeys();
@@ -193,15 +209,6 @@ export async function saveDuneCache() {
   });
 }
 
-export async function restoreOpamCache() {
-  return await core.group("Retrieve the opam cache", async () => {
-    const { key, restoreKeys } = await composeOpamCacheKeys();
-    const paths = composeOpamCachePaths();
-    const cacheKey = await restoreCache(key, restoreKeys, paths);
-    return cacheKey;
-  });
-}
-
 export async function saveOpamCache() {
   await core.group("Save the opam cache", async () => {
     await exec("opam", [

diff --git a/packages/setup-ocaml/src/installer.ts b/packages/setup-ocaml/src/installer.ts
@@ -3,9 +3,8 @@ import * as process from "node:process";
 import * as core from "@actions/core";
 import { exec } from "@actions/exec";
 import {
-  restoreCygwinCache,
   restoreDuneCache,
-  restoreOpamCache,
+  restoreOpamCaches,
   saveCygwinCache,
   saveOpamCache,
 } from "./cache.js";
@@ -31,15 +30,6 @@ 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);