Ensure uniqueness of overlay-base database cache keys

Author: kaspersv

src/overlay-database-utils.test.ts

@@ -271,10 +271,12 @@ test("overlay-base database cache keys remain stable", async (t) => {
 
   sinon.stub(apiClient, "getAutomationID").resolves("test-automation-id/");
   sinon.stub(gitUtils, "getCommitOid").resolves(commitOid);
+  sinon.stub(actionsUtil, "getWorkflowRunID").resolves("12345");
+  sinon.stub(actionsUtil, "getWorkflowRunAttempt").resolves("1");
 
   const saveKey = await getCacheSaveKey(config, codeQlVersion, "checkout-path");
   const expectedSaveKey =
-    "codeql-overlay-base-database-1-c5666c509a2d9895-javascript_python-2.23.0-abc123def456";
+    "codeql-overlay-base-database-1-c5666c509a2d9895-javascript_python-2.23.0-12345-1-abc123def456";
   t.is(
     saveKey,
     expectedSaveKey,

src/overlay-database-utils.ts

@@ -4,7 +4,7 @@ import * as path from "path";
 
 import * as actionsCache from "@actions/cache";
 
-import { getRequiredInput, getTemporaryDirectory } from "./actions-util";
+import { getRequiredInput, getTemporaryDirectory, getWorkflowRunAttempt, getWorkflowRunID } from "./actions-util";
 import { getAutomationID } from "./api-client";
 import { type CodeQL } from "./codeql";
 import { type Config } from "./config-utils";
@@ -453,12 +453,14 @@ export async function getCacheSaveKey(
   codeQlVersion: string,
   checkoutPath: string,
 ): Promise<string> {
+  const runId = await getWorkflowRunID();
+  const attemptId = await getWorkflowRunAttempt();
   const sha = await getCommitOid(checkoutPath);
   const restoreKeyPrefix = await getCacheRestoreKeyPrefix(
     config,
     codeQlVersion,
   );
-  return `${restoreKeyPrefix}${sha}`;
+  return `${restoreKeyPrefix}${runId}-${attemptId}-${sha}`;
 }
 
 /**