fix: remove interpolation in last sh and powershell calls

jenkinsci · Jun 23, 2024 · f48ef34 · f48ef34
1 parent af17f85
commit f48ef34
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -79,14 +79,17 @@ pipeline {
                                     script {
                                         def tagItems = env.TAG_NAME.split('-')
                                         if(tagItems.length == 2) {
-                                            def remotingVersion = tagItems[0]
-                                            def buildNumber = tagItems[1]
-                                            // This function is defined in the jenkins-infra/pipeline-library
-                                            infra.withDockerCredentials {
-                                                if (isUnix()) {
-                                                    sh "./build.sh -r ${remotingVersion} -b ${buildNumber} -d publish"
-                                                } else {
-                                                    powershell "& ./build.ps1 -RemotingVersion $remotingVersion -BuildNumber $buildNumber -DisableEnvProps publish"
+                                            withEnv(
+                                                ["REMOTING_VERSION=${tagItems[0]}"],
+                                                ["BUILD_NUMBER=${tagItems[1]}"]
+                                            ) {
+                                                // This function is defined in the jenkins-infra/pipeline-library
+                                                infra.withDockerCredentials {
+                                                    if (isUnix()) {
+                                                        sh './build.sh -r $REMOTING_VERSION -b $BUILD_NUMBER -d publish'
+                                                    } else {
+                                                        powershell '& ./build.ps1 -DisableEnvProps publish'
+                                                    }
                                                 }
                                             }
                                         } else {

diff --git a/build.ps1 b/build.ps1
@@ -64,6 +64,10 @@ if (![String]::IsNullOrWhiteSpace($env:REMOTING_VERSION)) {
     $RemotingVersion = $env:REMOTING_VERSION
 }
 
+if (![String]::IsNullOrWhiteSpace($env:BUILD_NUMBER)) {
+    $BuildNumber = $env:BUILD_NUMBER
+}
+
 if (![String]::IsNullOrWhiteSpace($env:IMAGE_TYPE)) {
     $ImageType = $env:IMAGE_TYPE
 }