Merge pull request #906 from ocaml/better-opam-download-cache-key

Better opam download cache key
ocaml · Dec 5, 2024 · c0fbcc4 · c0fbcc4
2 parents e9079d6 + f966f59
commit c0fbcc4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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
@@ -70,9 +70,9 @@ async function composeOpamDownloadCacheKeys() {
   const isWin = PLATFORM === "windows";
   const ocamlCompiler = await RESOLVED_COMPILER;
   const repositoryUrls = OPAM_REPOSITORIES.map(([_, value]) => value).join();
-  const plainKey = [isWin, ocamlCompiler, repositoryUrls].join();
+  const { runId, workflow, job } = github.context;
+  const plainKey = [isWin, job, ocamlCompiler, repositoryUrls, workflow].join();
   const hash = crypto.createHash("sha256").update(plainKey).digest("hex");
-  const { runId } = github.context;
   const key = `${CACHE_PREFIX}-setup-ocaml-opam-download-${hash}-${runId}`;
   const restoreKeys = [
     key,