You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by pg...@apache.org on 2025/11/27 21:40:25 UTC

(couchdb) branch jenkins-clouseau-3.0.0 updated: fixup: use local variables

This is an automated email from the ASF dual-hosted git repository.

pgj pushed a commit to branch jenkins-clouseau-3.0.0
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/jenkins-clouseau-3.0.0 by this push:
     new f06c0612f fixup: use local variables
f06c0612f is described below

commit f06c0612fec94d5419dde9fd42124b52683a6818
Author: Gabor Pali <ga...@ibm.com>
AuthorDate: Thu Nov 27 22:39:58 2025 +0100

    fixup: use local variables
---
 build-aux/Jenkinsfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/build-aux/Jenkinsfile b/build-aux/Jenkinsfile
index 00945faa1..0c8afbcf4 100644
--- a/build-aux/Jenkinsfile
+++ b/build-aux/Jenkinsfile
@@ -313,12 +313,11 @@ def generateNativeStage(platform) {
                 powershell( script: "New-Item -ItemType Directory -Path '${platform}/build' -Force", label: 'Create build directories' )
                 powershell( script: "tar -xf (Get-Item apache-couchdb-*.tar.gz) -C '${platform}/build' --strip-components=1", label: 'Unpack release' )
                 dir( "${platform}/build" ) {
-                  withClouseau = meta[platform].with_clouseau ? '-WithClouseau' : ''
+                  def withClouseau = meta[platform].with_clouseau ? '-WithClouseau' : ''
+                  def setClouseauJavaHome = ''
 
                   if (meta[platform].clouseau_java_home) {
                     setClouseauJavaHome = "Set-Item -Path env:CLOUSEAU_JAVA_HOME -Value '${meta[platform].clouseau_java_home}'"
-                  } else {
-                    setClouseauJavaHome = ''
                   }
 
                   powershell( script: """
@@ -401,11 +400,10 @@ def generateContainerStage(platform) {
                   sh( script: "mkdir -p ${platform}/build", label: 'Create build directories' )
                   sh( script: "tar -xf apache-couchdb-*.tar.gz -C ${platform}/build --strip-components=1", label: 'Unpack release' )
                   quickjs_tests262 = meta[platform].quickjs_test262
+                  def setClouseauJavaHome = ''
 
                   if (meta[platform].clouseau_java_home) {
                     setClouseauJavaHome = "env CLOUSEAU_JAVA_HOME='${meta[platform].clouseau_java_home}' "
-                  } else {
-                    setClouseauJavaHome = ""
                   }
 
                   dir( "${platform}/build" ) {