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 2023/04/18 20:52:40 UTC
[netbeans-jenkins-lib] branch ebarboni-patch-2 created (now 3d7e0ad)
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a change to branch ebarboni-patch-2
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
at 3d7e0ad change apidoc generation
This branch includes the following new commits:
new 3d7e0ad change apidoc generation
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
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
[netbeans-jenkins-lib] 01/01: change apidoc generation
Posted by sk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch ebarboni-patch-2
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
commit 3d7e0ad569c5abbf804869d4b26b398983408213
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Tue Apr 18 22:52:33 2023 +0200
change apidoc generation
Instead of publishing to nightlies apidoc for release juste use artefact for maven artefact generations.
Relax apidoc generation on releaseXXX branches.
---
vars/asfMainNetBeansBuild.groovy | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index bf80ddc..0e716ea 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -206,7 +206,7 @@ def call(Map params = [:]) {
}
}
- stage ('Released javadoc rebuild') {
+ stage ('Release branch javadoc rebuild to nightlies') {
tools {
jdk tooling.jdktool
}
@@ -215,7 +215,6 @@ def call(Map params = [:]) {
//expression { BRANCH_NAME ==~ /release[0-9]+/ }
branch pattern : "release\\d+",comparator:"REGEXP"
//wait for modern 1.4.1
- expression { month !='Invalid'}
}
}
@@ -225,6 +224,7 @@ def call(Map params = [:]) {
withAnt(installation: tooling.myAnt) {
sh "ant"
}
+ // use jdk version aligned to max supported
withAnt(installation: tooling.myAnt, jdk: tooling.jdktoolapidoc) {
sh "ant build-javadoc -Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
}
@@ -410,15 +410,11 @@ def doParallelClusters(cconfigs) {
// additionnal target to have maven ready
- // javadoc build
+ // javadoc build for maven artefacts, do the more we can using jdk of 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 -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 "ant -f build-${clustername}-temp/build.xml build-javadoc -Djavadoc.web.root='${apidocurl}' -Dmodules-javadoc-date='${date}' -Datom-date='${atomdate}' -Dmetabuild.branch=${branch}"
sh "cp -r build-${clustername}-temp/nbbuild/nbms/** dist${versionnedpath}nbms/"
-
- // apidoc
- publishToNightlies("/netbeans/apidocs/${env.BRANCH_NAME}","**/WEBZIP.zip")
-
- junit testResults: "build-${clustername}-temp/nbbuild/build/javadoc/checklinks-errors.xml", allowEmptyResults:true
+
def netbeansbase = "build-${clustername}-temp/nbbuild"
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)])
---------------------------------------------------------------------
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