Use better dune cache keys

Signed-off-by: Sora Morimoto <sora@morimoto.io>
ocaml · Aug 6, 2024 · a1a3d11 · a1a3d11
1 parent 653dbf2
commit a1a3d11
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0),
 ### Changed
 
 - Unlock `--with-doc` in analysis.
+- Use better dune cache keys.
 
 ### Fixed
 

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
@@ -29,14 +29,16 @@ async function composeCygwinCacheKeys() {
 }
 
 async function composeDuneCacheKeys() {
-  const { workflow, job } = github.context;
+  const { workflow, job, runId } = github.context;
   const ocamlCompiler = await RESOLVED_COMPILER;
-  const plainKey = [PLATFORM, ARCHITECTURE, ocamlCompiler, workflow, job].join(
-    ",",
-  );
+  const plainKey = [ocamlCompiler, workflow, job].join(",");
   const hash = crypto.createHash("sha256").update(plainKey).digest("hex");
-  const key = `${CACHE_PREFIX}-setup-ocaml-dune-${hash}`;
-  const restoreKeys = [key];
+  const key = `${CACHE_PREFIX}-setup-ocaml-dune-${PLATFORM}-${ARCHITECTURE}-${hash}-${runId}`;
+  const restoreKeys = [
+    key,
+    `${CACHE_PREFIX}-setup-ocaml-dune-${PLATFORM}-${ARCHITECTURE}-${hash}-`,
+    `${CACHE_PREFIX}-setup-ocaml-dune-${PLATFORM}-${ARCHITECTURE}-`,
+  ];
   core.debug(`dune cache key: ${plainKey}`);
   return { key, restoreKeys };
 }