From 333e9d97507751ffcc4387e25b260d74b5d06c3e Mon Sep 17 00:00:00 2001 From: daz Date: Fri, 15 Nov 2024 14:32:34 -0700 Subject: [PATCH] Do not ignore input parameters when `build-scan-publish` is enabled Fixes #447 --- sources/src/develocity/build-scan.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sources/src/develocity/build-scan.ts b/sources/src/develocity/build-scan.ts index f4e163f1..1f4f5846 100644 --- a/sources/src/develocity/build-scan.ts +++ b/sources/src/develocity/build-scan.ts @@ -5,13 +5,6 @@ import {setupToken} from './short-lived-token' export async function setup(config: BuildScanConfig): Promise { maybeExportVariable('DEVELOCITY_INJECTION_INIT_SCRIPT_NAME', 'gradle-actions.inject-develocity.init.gradle') maybeExportVariable('DEVELOCITY_AUTO_INJECTION_CUSTOM_VALUE', 'gradle-actions') - if (config.getBuildScanPublishEnabled()) { - maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true') - maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18.2') - maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0.2') - maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl()) - maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree()) - } maybeExportVariableNotEmpty('DEVELOCITY_INJECTION_ENABLED', config.getDevelocityInjectionEnabled()) maybeExportVariableNotEmpty('DEVELOCITY_URL', config.getDevelocityUrl()) @@ -24,6 +17,17 @@ export async function setup(config: BuildScanConfig): Promise { maybeExportVariableNotEmpty('GRADLE_PLUGIN_REPOSITORY_USERNAME', config.getGradlePluginRepositoryUsername()) maybeExportVariableNotEmpty('GRADLE_PLUGIN_REPOSITORY_PASSWORD', config.getGradlePluginRepositoryPassword()) + // If build-scan-publish is enabled, ensure the environment variables are set + // The DEVELOCITY_PLUGIN_VERSION and DEVELOCITY_CCUD_PLUGIN_VERSION are set to the latest versions + // except if they are defined in the configuration + if (config.getBuildScanPublishEnabled()) { + maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true') + maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18.2') + maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0.2') + maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl()) + maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree()) + } + return setupToken(config.getDevelocityAccessKey(), config.getDevelocityTokenExpiry()) }