From acfc536893aba422082de90a1f53b9ccfe0ae716 Mon Sep 17 00:00:00 2001 From: Erik Rasmussen Date: Tue, 29 Nov 2022 08:50:45 -0700 Subject: [PATCH] Fix windows gradle command with Vault to use correct cred variables. (#36) * Fix windows gradle command with Vault to use correct cred variables. * Revert version.txt --- .../jenkins/pipelinekt/dsl/step/custom/VaultGradleBuildDsl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/step/custom/VaultGradleBuildDsl.kt b/dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/step/custom/VaultGradleBuildDsl.kt index c4460cf..73d878e 100644 --- a/dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/step/custom/VaultGradleBuildDsl.kt +++ b/dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/step/custom/VaultGradleBuildDsl.kt @@ -71,8 +71,8 @@ data class VaultGradleBuildDsl( withVault(secrets = serviceAccountSecrets) { bat( ("gradlew.bat --stacktrace --build-cache " + - "-D$gradleUserProperty=\\\"%\\\${ARTIFACTORY_USERNAME}%\\\" " + - "-D$gradlePasswordProperty=\\\"%\\\${ARTIFACTORY_PASSWORD}%\\\" " + + "-D$gradleUserProperty=\\\"%ARTIFACTORY_USERNAME%\\\" " + + "-D$gradlePasswordProperty=\\\"%ARTIFACTORY_PASSWORD%\\\" " + "$additionalBuildArgs $command").strDouble() ) }