Skip to content

Commit

Permalink
Remove the lombok feature flag code
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ian Lynagh committed Jan 19, 2024
1 parent d0c8484 commit bd00f23
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
6 changes: 0 additions & 6 deletions src/feature-flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export interface FeatureEnablement {
* Each value of this enum should end with `_enabled`.
*/
export enum Feature {
CodeqlJavaLombokEnabled = "codeql_java_lombok_enabled",
CppDependencyInstallation = "cpp_dependency_installation_enabled",
DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
Expand All @@ -58,11 +57,6 @@ export const featureConfig: Record<
Feature,
{ envVar: string; minimumVersion: string | undefined; defaultValue: boolean }
> = {
[Feature.CodeqlJavaLombokEnabled]: {
envVar: "CODEQL_JAVA_LOMBOK",
minimumVersion: "2.14.0",
defaultValue: false,
},
[Feature.CppDependencyInstallation]: {
envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
minimumVersion: "2.15.0",
Expand Down
13 changes: 6 additions & 7 deletions src/init-action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -425,20 +425,19 @@ async function run() {
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";
if (process.env[envVar]) {
logger.info(
`Environment variable ${envVar} already set. Not en/disabling CodeQL Java Lombok support`,
);
} else if (
await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql)
) {
} else {
logger.info("Enabling CodeQL Java Lombok support");
core.exportVariable(envVar, "true");
} else {
logger.info("Disabling CodeQL Java Lombok support");
core.exportVariable(envVar, "false");
}
}

Expand Down

0 comments on commit bd00f23

Please sign in to comment.