From cbcae45fffacea44eec0222c515b06a260497ab4 Mon Sep 17 00:00:00 2001
From: Kasper Svendsen <kaspersv@github.com>
Date: Fri, 24 Oct 2025 15:46:17 +0200
Subject: [PATCH] Reorder components of overlay-base cache key postfix

---
 lib/analyze-action.js              | 2 +-
 src/overlay-database-utils.test.ts | 2 +-
 src/overlay-database-utils.ts      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 9efff648c..bcb46d5d3 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -91082,7 +91082,7 @@ async function getCacheSaveKey(config, codeQlVersion, checkoutPath) {
     config,
     codeQlVersion
   );
-  return `${restoreKeyPrefix}${runId}-${attemptId}-${sha}`;
+  return `${restoreKeyPrefix}${sha}-${runId}-${attemptId}`;
 }
 async function getCacheRestoreKeyPrefix(config, codeQlVersion) {
   const languages = [...config.languages].sort().join("_");
diff --git a/src/overlay-database-utils.test.ts b/src/overlay-database-utils.test.ts
index 7124d4ece..d04668e98 100644
--- 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
index e3d06866f..bb62ec0c9 100644
--- 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}`;
 }
 
 /**