From d5b5e18245fbcc63d516179516b2d00198bc855d Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 18 Aug 2023 12:25:07 +0100 Subject: [PATCH] Lombok: Don't set env var if it's already set If the user has manually configured it, then we let their setting stand. --- src/init-action.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/init-action.ts b/src/init-action.ts index 977ed3f3b..f030dfa00 100644 --- a/src/init-action.ts +++ b/src/init-action.ts @@ -347,18 +347,19 @@ async function run() { } if (config.languages.includes(Language.java)) { - if (await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql)) { - logger.info("Enabling CodeQL Java Lombok support"); - core.exportVariable( - "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS", - "true", + 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) + ) { + logger.info("Enabling CodeQL Java Lombok support"); + core.exportVariable(envVar, "true"); } else { logger.info("Disabling CodeQL Java Lombok support"); - core.exportVariable( - "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS", - "false", - ); + core.exportVariable(envVar, "false"); } }