robojerk/codeql-action

Merge pull request #1844 from github/igfoo/lombok_no_overwrite

Browse source 
Lombok: Don't set env var if it's already set
This commit is contained in:
Ian Lynagh 2023-08-18 19:57:50 +01:00 • committed by GitHub
commit e4262713b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
## [UNRELEASED] ## [UNRELEASED]
No user facing changes. - Fixed a bug in CodeQL Action 2.21.3 onwards that affected beta support for [Project Lombok](https://projectlombok.org/) when analyzing Java. The environment variable `CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS` will now be respected if it was manually configured in the workflow. [#1844](https://github.com/github/codeql-action/pull/1844)
## 2.21.4 - 14 Aug 2023 ## 2.21.4 - 14 Aug 2023

10
lib/init-action.js generated
View file

@ -180,13 +180,17 @@ async function run() {
core.exportVariable("CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN", "true"); core.exportVariable("CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN", "true");
} }
if (config.languages.includes(languages_1.Language.java)) { if (config.languages.includes(languages_1.Language.java)) {
if (await features.getValue(feature_flags_1.Feature.CodeqlJavaLombokEnabled, codeql)) { 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_flags_1.Feature.CodeqlJavaLombokEnabled, codeql)) {
logger.info("Enabling CodeQL Java Lombok support"); logger.info("Enabling CodeQL Java Lombok support");
core.exportVariable("CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS", "true"); core.exportVariable(envVar, "true");
} }
else { else {
logger.info("Disabling CodeQL Java Lombok support"); logger.info("Disabling CodeQL Java Lombok support");
core.exportVariable("CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS", "false"); core.exportVariable(envVar, "false");
} }
} }
// Disable Python dependency extraction if feature flag set // Disable Python dependency extraction if feature flag set

2
lib/init-action.js.map
View file

File diff suppressed because one or more lines are too long

19
src/init-action.ts
View file

@ -347,18 +347,19 @@ async function run() {
} }
if (config.languages.includes(Language.java)) { if (config.languages.includes(Language.java)) {
if (await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql)) { const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS";
logger.info("Enabling CodeQL Java Lombok support"); if (process.env[envVar]) {
core.exportVariable( logger.info(
"CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS", `Environment variable ${envVar} already set. Not en/disabling CodeQL Java Lombok support`,
"true",
); );
} else if (
await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql)
) {
logger.info("Enabling CodeQL Java Lombok support");
core.exportVariable(envVar, "true");
} else { } else {
logger.info("Disabling CodeQL Java Lombok support"); logger.info("Disabling CodeQL Java Lombok support");
core.exportVariable( core.exportVariable(envVar, "false");
"CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS",
"false",
);
} }
} }