Skip to content

Commit 2cc0af0

Browse files
committed
Lombok: Don't set env var if it's already set
If the user has manually configured it, then we let their setting stand.
1 parent e683046 commit 2cc0af0

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/init-action.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,16 +347,19 @@ async function run() {
347347
}
348348

349349
if (config.languages.includes(Language.java)) {
350-
if (await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql)) {
350+
const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS"
351+
if (process.env[envVar]) {
352+
logger.info("Environment variable " + envVar + " already set. Not en/disabling CodeQL Java Lombok support");
353+
} else if (await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql)) {
351354
logger.info("Enabling CodeQL Java Lombok support");
352355
core.exportVariable(
353-
"CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS",
356+
envVar,
354357
"true",
355358
);
356359
} else {
357360
logger.info("Disabling CodeQL Java Lombok support");
358361
core.exportVariable(
359-
"CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS",
362+
envVar,
360363
"false",
361364
);
362365
}

0 commit comments

Comments
 (0)