From 4885eb2ad9dd519f35db3ab42db9ca66b2ea3619 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Sun, 9 Nov 2025 11:17:02 +0000
Subject: [PATCH] Insert new `featurePrefix` after general cache key `prefix`

---
 lib/analyze-action.js     |  6 +++++-
 lib/init-action.js        |  6 +++++-
 src/dependency-caching.ts | 10 ++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 3a73102e1..b8804700e 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -91229,7 +91229,11 @@ async function cachePrefix2(codeql, features, language) {
     prefix = `${prefix}-${customPrefix}`;
   }
   const featurePrefix = await getFeaturePrefix(codeql, features, language);
-  return `${featurePrefix}${prefix}-${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  if (featurePrefix === "minify-") {
+    return `${featurePrefix}${prefix}-${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  } else {
+    return `${prefix}-${featurePrefix}${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  }
 }
 var internal = {
   makePatternCheck
diff --git a/lib/init-action.js b/lib/init-action.js
index e0b5b9ed1..d1e5f331e 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -87403,7 +87403,11 @@ async function cachePrefix2(codeql, features, language) {
     prefix = `${prefix}-${customPrefix}`;
   }
   const featurePrefix = await getFeaturePrefix(codeql, features, language);
-  return `${featurePrefix}${prefix}-${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  if (featurePrefix === "minify-") {
+    return `${featurePrefix}${prefix}-${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  } else {
+    return `${prefix}-${featurePrefix}${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  }
 }
 var internal = {
   makePatternCheck
diff --git a/src/dependency-caching.ts b/src/dependency-caching.ts
index bf616fbc5..15c0e502c 100644
--- a/src/dependency-caching.ts
+++ b/src/dependency-caching.ts
@@ -524,8 +524,14 @@ async function cachePrefix(
   // experimental features that affect the cache contents.
   const featurePrefix = await getFeaturePrefix(codeql, features, language);
 
-  // Assemble the cache key.
-  return `${featurePrefix}${prefix}-${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  // Assemble the cache key. For backwards compatibility with the JAR minification experiment's existing
+  // feature prefix usage, we add that feature prefix at the start. Other feature prefixes are inserted
+  // after the general CodeQL dependency cache prefix.
+  if (featurePrefix === "minify-") {
+    return `${featurePrefix}${prefix}-${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  } else {
+    return `${prefix}-${featurePrefix}${CODEQL_DEPENDENCY_CACHE_VERSION}-${runnerOs}-${language}-`;
+  }
 }
 
 /** Represents information about our overall cache usage for CodeQL dependency caches. */