Add FF for configuration merging

This commit is contained in:
Michael B. Gale
2026-07-06 11:50:36 +01:00
parent a52a9662e9
commit 132634ddfd
2 changed files with 12 additions and 0 deletions

5
lib/entry-points.js generated
View File

@@ -145967,6 +145967,11 @@ var LINKED_CODEQL_VERSION = {
tagName: bundleVersion
};
var featureConfig = {
["allow_merge_config_files" /* AllowMergeConfigFiles */]: {
defaultValue: false,
envVar: "CODEQL_ACTION_ALLOW_MERGE_CONFIG_FILES",
minimumVersion: void 0
},
["allow_multiple_analysis_kinds" /* AllowMultipleAnalysisKinds */]: {
defaultValue: false,
envVar: "CODEQL_ACTION_ALLOW_MULTIPLE_ANALYSIS_KINDS",

View File

@@ -70,6 +70,8 @@ export interface CodeQLDefaultVersionInfo {
* Legacy features should end with `_enabled`.
*/
export enum Feature {
/** Allows supported properties of configuration files to be merged. */
AllowMergeConfigFiles = "allow_merge_config_files",
/** Controls whether we allow multiple values for the `analysis-kinds` input. */
AllowMultipleAnalysisKinds = "allow_multiple_analysis_kinds",
AllowToolcacheInput = "allow_toolcache_input",
@@ -171,6 +173,11 @@ export type FeatureConfig = {
};
export const featureConfig = {
[Feature.AllowMergeConfigFiles]: {
defaultValue: false,
envVar: "CODEQL_ACTION_ALLOW_MERGE_CONFIG_FILES",
minimumVersion: undefined,
},
[Feature.AllowMultipleAnalysisKinds]: {
defaultValue: false,
envVar: "CODEQL_ACTION_ALLOW_MULTIPLE_ANALYSIS_KINDS",