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 2022/04/14 12:16:16 UTC
[netbeans-jenkins-lib] branch master updated: try metabuild.branch for vs and release
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 8b88413 try metabuild.branch for vs and release
8b88413 is described below
commit 8b884135fce1c13a626a80843ef4c29ba8e8f1ec
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Thu Apr 14 14:16:12 2022 +0200
try metabuild.branch for vs and release
---
vars/asfMainNetBeansBuild.groovy | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index c45f182..32b330d 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -272,7 +272,7 @@ def doParallelClusters(cconfigs) {
stage("prepare ${clustername}") {
sh "rm -rf nbbuild/build"
- sh "ant build-source-config -Dcluster.config=${clustername} -Dbuildnum=666"
+ sh "ant build-source-config -Dcluster.config=${clustername} -Dbuildnum=666 -Dmetabuild.branch=${branch}"
script {
def targets = ['verify-libs-and-licenses','rat','build']
for (String target in targets) {
@@ -286,7 +286,7 @@ def doParallelClusters(cconfigs) {
}
// build the target on the cluster defined common to all
- sh "ant -f ${target}-${clustername}-temp/build.xml ${target} -Dcluster.config=${clustername} ${add}"
+ sh "ant -f ${target}-${clustername}-temp/build.xml ${target} -Dcluster.config=${clustername} ${add} -Dmetabuild.branch=${branch}"
// for verify-libs-and-licenses we only want the reports
if (target=='verify-libs-and-licenses') {
@@ -351,15 +351,15 @@ def doParallelClusters(cconfigs) {
// additionnal target to have maven ready
// javadoc build
- sh "ant -f build-${clustername}-temp/build.xml build-nbms build-source-zips generate-uc-catalog -Dcluster.config=release -Ddo.build.windows.launchers=true"
- sh "ant -f build-${clustername}-temp/build.xml build-javadoc -Djavadoc.web.root='${apidocurl}' -Dmodules-javadoc-date='${date}' -Datom-date='${atomdate}' -Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
+ sh "ant -f build-${clustername}-temp/build.xml build-nbms build-source-zips generate-uc-catalog -Dcluster.config=release -Ddo.build.windows.launchers=true -Dmetabuild.branch=${branch}"
+ sh "ant -f build-${clustername}-temp/build.xml build-javadoc -Djavadoc.web.root='${apidocurl}' -Dmodules-javadoc-date='${date}' -Datom-date='${atomdate}' -Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip -Dmetabuild.branch=${branch}"
sh "cp -r build-${clustername}-temp/nbbuild/nbms/** dist${versionnedpath}nbms/"
archiveArtifacts 'WEBZIP.zip'
def localRepo = ".repository"
def netbeansbase = "build-${clustername}-temp/nbbuild"
- sh "ant -f build-${clustername}-temp/build.xml getallmavencoordinates"
+ sh "ant -f build-${clustername}-temp/build.xml getallmavencoordinates -Dmetabuild.branch=${branch}"
withMaven(maven:tooling.myMaven,jdk:tooling.jdktool,publisherStrategy: 'EXPLICIT',mavenLocalRepo: localRepo,options:[artifactsPublisher(disabled: true)])
{
@@ -369,7 +369,7 @@ def doParallelClusters(cconfigs) {
sh "mvn org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate ${commonparam} -DnetbeansNbmDirectory=${netbeansbase}/nbms -DnetbeansInstallDirectory=${netbeansbase}/netbeans -DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips -DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc -DparentGAV=org.apache.netbeans:netbeans-parent:2 -DforcedVersion=${mavenVersion} -DskipInstall=true -DdeployUrl=file://${env.WORKSPACE}/m [...]
// make vsix available to dist to pickup (only for main release) need a maven setup
- sh "ant -f build-${clustername}-temp/java/java.lsp.server build-vscode-ext -Dvsix.version=${vsixversion}"
+ sh "ant -f build-${clustername}-temp/java/java.lsp.server build-vscode-ext -Dvsix.version=${vsixversion} -Dmetabuild.branch=${branch}"
sh "cp -r build-${clustername}-temp/java/java.lsp.server/build/*.vsix dist/vsix/"
}
archiveArtifacts 'mavenrepository/**'
---------------------------------------------------------------------
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