Skip to content

Commit bd00f23

Browse files
committed
Remove the lombok feature flag code
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.
1 parent d0c8484 commit bd00f23

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

src/feature-flags.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export interface FeatureEnablement {
4444
* Each value of this enum should end with `_enabled`.
4545
*/
4646
export enum Feature {
47-
CodeqlJavaLombokEnabled = "codeql_java_lombok_enabled",
4847
CppDependencyInstallation = "cpp_dependency_installation_enabled",
4948
DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
5049
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
@@ -58,11 +57,6 @@ export const featureConfig: Record<
5857
Feature,
5958
{ envVar: string; minimumVersion: string | undefined; defaultValue: boolean }
6059
> = {
61-
[Feature.CodeqlJavaLombokEnabled]: {
62-
envVar: "CODEQL_JAVA_LOMBOK",
63-
minimumVersion: "2.14.0",
64-
defaultValue: false,
65-
},
6660
[Feature.CppDependencyInstallation]: {
6761
envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
6862
minimumVersion: "2.15.0",

src/init-action.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -425,20 +425,19 @@ async function run() {
425425
core.exportVariable(kotlinLimitVar, "1.9.20");
426426
}
427427

428-
if (config.languages.includes(Language.java)) {
428+
if (
429+
config.languages.includes(Language.java) &&
430+
(await codeQlVersionAbove(codeql, "2.14.0")) &&
431+
!(await codeQlVersionAbove(codeql, "2.14.4"))
432+
) {
429433
const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS";
430434
if (process.env[envVar]) {
431435
logger.info(
432436
`Environment variable ${envVar} already set. Not en/disabling CodeQL Java Lombok support`,
433437
);
434-
} else if (
435-
await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql)
436-
) {
438+
} else {
437439
logger.info("Enabling CodeQL Java Lombok support");
438440
core.exportVariable(envVar, "true");
439-
} else {
440-
logger.info("Disabling CodeQL Java Lombok support");
441-
core.exportVariable(envVar, "false");
442441
}
443442
}
444443

0 commit comments

Comments
 (0)