Reorder components of overlay-base cache key postfix

kaspersv · kaspersv · commit cbcae45fffac · 2025-10-24T15:46:17.000+02:00
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
diff --git a/src/overlay-database-utils.test.ts b/src/overlay-database-utils.test.ts
@@ -276,7 +276,7 @@ test("overlay-base database cache keys remain stable", async (t) => {
 
   const saveKey = await getCacheSaveKey(config, codeQlVersion, "checkout-path");
   const expectedSaveKey =
-    "codeql-overlay-base-database-1-c5666c509a2d9895-javascript_python-2.23.0-12345-1-abc123def456";
+    "codeql-overlay-base-database-1-c5666c509a2d9895-javascript_python-2.23.0-abc123def456-12345-1";
   t.is(
     saveKey,
     expectedSaveKey,
diff --git a/src/overlay-database-utils.ts b/src/overlay-database-utils.ts
@@ -465,7 +465,7 @@ export async function getCacheSaveKey(
     config,
     codeQlVersion,
   );
-  return `${restoreKeyPrefix}${runId}-${attemptId}-${sha}`;
+  return `${restoreKeyPrefix}${sha}-${runId}-${attemptId}`;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ export async function getCacheSaveKey(`
`465`	`465`	`config,`
`466`	`466`	`codeQlVersion,`
`467`	`467`	`);`
`468`		- return `${restoreKeyPrefix}${runId}-${attemptId}-${sha}`;
	`468`	+ return `${restoreKeyPrefix}${sha}-${runId}-${attemptId}`;
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`/**`