robojerk/codeql-action

Remove the lombok feature flag code

Browse source 
We still set the env var for 2.14.0 - 2.14.3, as they defaulted to not
enabling Lombok support but had support enabled by the feature flag.
This commit is contained in:
Ian Lynagh 2024-01-19 11:34:26 +00:00
parent d0c848438b
commit bd00f23331
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/feature-flags.ts
View file

@ -44,7 +44,6 @@ export interface FeatureEnablement {
* Each value of this enum should end with `_enabled`. * Each value of this enum should end with `_enabled`.
*/ */
export enum Feature { export enum Feature {
CodeqlJavaLombokEnabled = "codeql_java_lombok_enabled",
CppDependencyInstallation = "cpp_dependency_installation_enabled", CppDependencyInstallation = "cpp_dependency_installation_enabled",
DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled", DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled", DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
@ -58,11 +57,6 @@ export const featureConfig: Record<
Feature, Feature,
{ envVar: string; minimumVersion: string | undefined; defaultValue: boolean } { envVar: string; minimumVersion: string | undefined; defaultValue: boolean }
> = { > = {
[Feature.CodeqlJavaLombokEnabled]: {
envVar: "CODEQL_JAVA_LOMBOK",
minimumVersion: "2.14.0",
defaultValue: false,
},
[Feature.CppDependencyInstallation]: { [Feature.CppDependencyInstallation]: {
envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES", envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
minimumVersion: "2.15.0", minimumVersion: "2.15.0",

13
src/init-action.ts
View file

@ -425,20 +425,19 @@ async function run() {
core.exportVariable(kotlinLimitVar, "1.9.20"); core.exportVariable(kotlinLimitVar, "1.9.20");
} }
if (config.languages.includes(Language.java)) { if (
config.languages.includes(Language.java) &&
(await codeQlVersionAbove(codeql, "2.14.0")) &&
!(await codeQlVersionAbove(codeql, "2.14.4"))
) {
const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS"; const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS";
if (process.env[envVar]) { if (process.env[envVar]) {
logger.info( logger.info(
`Environment variable ${envVar} already set. Not en/disabling CodeQL Java Lombok support`, `Environment variable ${envVar} already set. Not en/disabling CodeQL Java Lombok support`,
); );
} else if ( } else {
await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql)
) {
logger.info("Enabling CodeQL Java Lombok support"); logger.info("Enabling CodeQL Java Lombok support");
core.exportVariable(envVar, "true"); core.exportVariable(envVar, "true");
} else {
logger.info("Disabling CodeQL Java Lombok support");
core.exportVariable(envVar, "false");
} }
} }