You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2019/06/26 13:11:28 UTC

[netbeans-jenkins-lib] branch master updated: add buildnum

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

skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new 92940a1  add buildnum
92940a1 is described below

commit 92940a1f8f8abbe887011426db3ec7b0c8d1e47c
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Wed Jun 26 15:11:20 2019 +0200

    add buildnum
---
 vars/asfMainNetBeansBuild.groovy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 87ab4b1..ad123a8 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -99,7 +99,7 @@ def call(Map params = [:]) {
                                 def clusterconfigs = ['platform','release']
                                 def targets = ['verify-libs-and-licenses','rat','build']
                                 for (String clusterconfig in clusterconfigs) {
-                                    sh "ant build-source-config -Dcluster.config=${clusterconfig}"
+                                    sh "ant build-source-config -Dcluster.config=${clusterconfig} -Dbuildnum=${env.BRANCH_NAME}_${env.BUILD_NUMBER}"
                                     for (String target in targets){
                                         sh "rm -rf ${env.WORKSPACE}/${target}-${clusterconfig}-temp"
                                         sh "mkdir  ${env.WORKSPACE}/${target}-${clusterconfig}-temp"
@@ -107,7 +107,7 @@ def call(Map params = [:]) {
                                         sh "unzip ${env.WORKSPACE}/nbbuild/build/*${clusterconfig}*.zip"
                                         sh "cp ${env.WORKSPACE}/.gitignore ."
                                         def add = "";
-                                        if (clusterconfig=="build") {
+                                        if (target=="build") {
                                             add=" -Ddo.build.windows.launchers=true"
                                         }
                                         sh "ant -f ${target}-${clusterconfig}-temp/build.xml ${target} -Dcluster.config=${clusterconfig} ${add}"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists