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/10/14 16:24:18 UTC
[netbeans-jenkins-lib] branch master updated: try some layout
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 f9d46bf try some layout
f9d46bf is described below
commit f9d46bf15057dce0bf3666a06e4d157eb09651dc
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Oct 14 18:24:14 2022 +0200
try some layout
---
vars/asfMainNetBeansBuild.groovy | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 51b0a7d..aaae1fd 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -276,7 +276,7 @@ def call(Map params = [:]) {
}
}
-def publishToNightlies(remotedirectory , source) {
+def publishToNightlies(remotedirectory , source, prefix="") {
sshPublisher(publishers: [
sshPublisherDesc(configName: 'Nightlies', transfers: [
sshTransfer(cleanRemote: true,
@@ -289,7 +289,7 @@ def publishToNightlies(remotedirectory , source) {
patternSeparator: '[, ]+',
remoteDirectory: remotedirectory,
remoteDirectorySDF: false,
- removePrefix: "",
+ removePrefix: prefix,
sourceFiles: source)],
usePromotionTimestamp: false,
useWorkspaceInPromotion: false,
@@ -388,7 +388,10 @@ def doParallelClusters(cconfigs) {
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/"
-
+
+ // apidoc
+ publishToNightlies("/netbeans/apidocs/${env.BRANCH_NAME}","**/WEBZIP.zip")
+
archiveArtifacts 'WEBZIP.zip'
junit testResults: "build-${clustername}-temp/nbbuild/build/javadoc/checklinks-errors.xml", allowEmptyResults:true
def localRepo = ".repository"
@@ -419,10 +422,8 @@ def doParallelClusters(cconfigs) {
}
archiveArtifacts 'dist/**'
- // apidoc
- publishToNightlies("/netbeans/apidocs/${env.BRANCH_NAME}","**/WEBZIP.zip")
-
- publishToNightlies("/netbeans/releasereparation/","dist/**/*.*")
+
+ publishToNightlies("/netbeans/candidate/${versionnedpath}","dist${versionnedpath}/**/**","dist/","dist${versionnedpath}")
}
}
}
---------------------------------------------------------------------
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