File tree Expand file tree Collapse file tree 2 files changed +6
-13
lines changed Expand file tree Collapse file tree 2 files changed +6
-13
lines changed Original file line number Diff line number Diff line change @@ -44,7 +44,6 @@ export interface FeatureEnablement {
44
44
* Each value of this enum should end with `_enabled`.
45
45
*/
46
46
export enum Feature {
47
- CodeqlJavaLombokEnabled = "codeql_java_lombok_enabled" ,
48
47
CppDependencyInstallation = "cpp_dependency_installation_enabled" ,
49
48
DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled" ,
50
49
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled" ,
@@ -58,11 +57,6 @@ export const featureConfig: Record<
58
57
Feature ,
59
58
{ envVar : string ; minimumVersion : string | undefined ; defaultValue : boolean }
60
59
> = {
61
- [ Feature . CodeqlJavaLombokEnabled ] : {
62
- envVar : "CODEQL_JAVA_LOMBOK" ,
63
- minimumVersion : "2.14.0" ,
64
- defaultValue : false ,
65
- } ,
66
60
[ Feature . CppDependencyInstallation ] : {
67
61
envVar : "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES" ,
68
62
minimumVersion : "2.15.0" ,
Original file line number Diff line number Diff line change @@ -425,20 +425,19 @@ async function run() {
425
425
core . exportVariable ( kotlinLimitVar , "1.9.20" ) ;
426
426
}
427
427
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
+ ) {
429
433
const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS" ;
430
434
if ( process . env [ envVar ] ) {
431
435
logger . info (
432
436
`Environment variable ${ envVar } already set. Not en/disabling CodeQL Java Lombok support` ,
433
437
) ;
434
- } else if (
435
- await features . getValue ( Feature . CodeqlJavaLombokEnabled , codeql )
436
- ) {
438
+ } else {
437
439
logger . info ( "Enabling CodeQL Java Lombok support" ) ;
438
440
core . exportVariable ( envVar , "true" ) ;
439
- } else {
440
- logger . info ( "Disabling CodeQL Java Lombok support" ) ;
441
- core . exportVariable ( envVar , "false" ) ;
442
441
}
443
442
}
444
443
You can’t perform that action at this time.
0 commit comments