Propagate features into cachePrefix function

lib/analyze-action.js

@@ -91098,7 +91098,7 @@ function getDefaultCacheConfig() {
 async function makeGlobber(patterns) {
   return glob.create(patterns.join("\n"));
 }
-async function uploadDependencyCaches(config, logger, minimizeJavaJars) {
+async function uploadDependencyCaches(codeql, features, config, logger) {
   const status = [];
   for (const language of config.languages) {
     const cacheConfig = getDefaultCacheConfig()[language];
@@ -91124,7 +91124,7 @@ async function uploadDependencyCaches(config, logger, minimizeJavaJars) {
       );
       continue;
     }
-    const key = await cacheKey2(language, cacheConfig, minimizeJavaJars);
+    const key = await cacheKey2(codeql, features, language, cacheConfig);
     logger.info(
       `Uploading cache of size ${size} for ${language} with key ${key}...`
     );
@@ -91152,17 +91152,21 @@ async function uploadDependencyCaches(config, logger, minimizeJavaJars) {
   }
   return status;
 }
-async function cacheKey2(language, cacheConfig, minimizeJavaJars = false) {
+async function cacheKey2(codeql, features, language, cacheConfig) {
   const hash2 = await glob.hashFiles(cacheConfig.hash.join("\n"));
-  return `${await cachePrefix2(language, minimizeJavaJars)}${hash2}`;
+  return `${await cachePrefix2(codeql, features, language)}${hash2}`;
 }
-async function cachePrefix2(language, minimizeJavaJars) {
+async function cachePrefix2(codeql, features, language) {
   const runnerOs = getRequiredEnvParam("RUNNER_OS");
   const customPrefix = process.env["CODEQL_ACTION_DEPENDENCY_CACHE_PREFIX" /* DEPENDENCY_CACHING_PREFIX */];
   let prefix = CODEQL_DEPENDENCY_CACHE_PREFIX;
   if (customPrefix !== void 0 && customPrefix.length > 0) {
     prefix = `${prefix}-${customPrefix}`;
   }
+  const minimizeJavaJars = await features.getValue(
+    "java_minimize_dependency_jars" /* JavaMinimizeDependencyJars */,
+    codeql
+  );
   if (language === "java" /* java */ && minimizeJavaJars) {
     prefix = `minify-${prefix}`;
   }
@@ -93980,14 +93984,11 @@ async function run() {
       logger
     );
     if (shouldStoreCache(config.dependencyCachingEnabled)) {
-      const minimizeJavaJars = await features.getValue(
-        "java_minimize_dependency_jars" /* JavaMinimizeDependencyJars */,
-        codeql
-      );
       dependencyCacheResults = await uploadDependencyCaches(
+        codeql,
+        features,
         config,
-        logger,
-        minimizeJavaJars
+        logger
       );
     }
     if (isInTestMode()) {

lib/init-action.js

@@ -87285,7 +87285,7 @@ function getDefaultCacheConfig() {
 async function makeGlobber(patterns) {
   return glob.create(patterns.join("\n"));
 }
-async function downloadDependencyCaches(languages, logger, minimizeJavaJars) {
+async function downloadDependencyCaches(codeql, features, languages, logger) {
   const status = [];
   for (const language of languages) {
     const cacheConfig = getDefaultCacheConfig()[language];
@@ -87303,9 +87303,9 @@ async function downloadDependencyCaches(languages, logger, minimizeJavaJars) {
       );
       continue;
     }
-    const primaryKey = await cacheKey2(language, cacheConfig, minimizeJavaJars);
+    const primaryKey = await cacheKey2(codeql, features, language, cacheConfig);
     const restoreKeys = [
-      await cachePrefix2(language, minimizeJavaJars)
+      await cachePrefix2(codeql, features, language)
     ];
     logger.info(
       `Downloading cache for ${language} with key ${primaryKey} and restore keys ${restoreKeys.join(
@@ -87330,17 +87330,21 @@ async function downloadDependencyCaches(languages, logger, minimizeJavaJars) {
   }
   return status;
 }
-async function cacheKey2(language, cacheConfig, minimizeJavaJars = false) {
+async function cacheKey2(codeql, features, language, cacheConfig) {
   const hash = await glob.hashFiles(cacheConfig.hash.join("\n"));
-  return `${await cachePrefix2(language, minimizeJavaJars)}${hash}`;
+  return `${await cachePrefix2(codeql, features, language)}${hash}`;
 }
-async function cachePrefix2(language, minimizeJavaJars) {
+async function cachePrefix2(codeql, features, language) {
   const runnerOs = getRequiredEnvParam("RUNNER_OS");
   const customPrefix = process.env["CODEQL_ACTION_DEPENDENCY_CACHE_PREFIX" /* DEPENDENCY_CACHING_PREFIX */];
   let prefix = CODEQL_DEPENDENCY_CACHE_PREFIX;
   if (customPrefix !== void 0 && customPrefix.length > 0) {
     prefix = `${prefix}-${customPrefix}`;
   }
+  const minimizeJavaJars = await features.getValue(
+    "java_minimize_dependency_jars" /* JavaMinimizeDependencyJars */,
+    codeql
+  );
   if (language === "java" /* java */ && minimizeJavaJars) {
     prefix = `minify-${prefix}`;
   }
@@ -90072,15 +90076,12 @@ exec ${goBinaryPath} "$@"`
         core13.exportVariable(envVar, "false");
       }
     }
-    const minimizeJavaJars = await features.getValue(
-      "java_minimize_dependency_jars" /* JavaMinimizeDependencyJars */,
-      codeql
-    );
     if (shouldRestoreCache(config.dependencyCachingEnabled)) {
       dependencyCachingResults = await downloadDependencyCaches(
+        codeql,
+        features,
         config.languages,
-        logger,
-        minimizeJavaJars
+        logger
       );
     }
     if (await codeQlVersionAtLeast(codeql, "2.17.1")) {
@@ -90118,7 +90119,7 @@ exec ${goBinaryPath} "$@"`
       logger.debug(
         `${"CODEQL_EXTRACTOR_JAVA_OPTION_MINIMIZE_DEPENDENCY_JARS" /* JAVA_EXTRACTOR_MINIMIZE_DEPENDENCY_JARS */} is already set to '${process.env["CODEQL_EXTRACTOR_JAVA_OPTION_MINIMIZE_DEPENDENCY_JARS" /* JAVA_EXTRACTOR_MINIMIZE_DEPENDENCY_JARS */]}', so the Action will not override it.`
       );
-    } else if (minimizeJavaJars && config.dependencyCachingEnabled && config.buildMode === "none" /* None */ && config.languages.includes("java" /* java */)) {
+    } else if (await features.getValue("java_minimize_dependency_jars" /* JavaMinimizeDependencyJars */, codeql) && config.dependencyCachingEnabled && config.buildMode === "none" /* None */ && config.languages.includes("java" /* java */)) {
       core13.exportVariable(
         "CODEQL_EXTRACTOR_JAVA_OPTION_MINIMIZE_DEPENDENCY_JARS" /* JAVA_EXTRACTOR_MINIMIZE_DEPENDENCY_JARS */,
         "true"

lib/setup-codeql-action.js

@@ -83876,6 +83876,11 @@ var featureConfig = {
     legacyApi: true,
     minimumVersion: "2.15.0"
   },
+  ["csharp_new_cache_key" /* CsharpNewCacheKey */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_CSHARP_NEW_CACHE_KEY",
+    minimumVersion: void 0
+  },
   ["diff_informed_queries" /* DiffInformedQueries */]: {
     defaultValue: true,
     envVar: "CODEQL_ACTION_DIFF_INFORMED_QUERIES",

lib/start-proxy-action.js

@@ -99995,6 +99995,11 @@ var featureConfig = {
     legacyApi: true,
     minimumVersion: "2.15.0"
   },
+  ["csharp_new_cache_key" /* CsharpNewCacheKey */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_CSHARP_NEW_CACHE_KEY",
+    minimumVersion: void 0
+  },
   ["diff_informed_queries" /* DiffInformedQueries */]: {
     defaultValue: true,
     envVar: "CODEQL_ACTION_DIFF_INFORMED_QUERIES",