ebarboni commented on a change in pull request #49:
URL:
https://github.com/apache/netbeans-jenkins-lib/pull/49#discussion_r787892448
##########
File path: vars/asfMainNetBeansBuild.groovy
##########
@@ -273,111 +281,115 @@ def doParallelClusters(cconfigs) {
// prepare a clean subfolder target - clustername
prefixed
sh "rm -rf ${target}-${clustername}-temp && mkdir
${target}-${clustername}-temp && unzip nbbuild/build/${clustername}*.zip -d
${target}-${clustername}-temp && cp .gitignore
${env.WORKSPACE}/${target}-${clustername}-temp"
def add = "";
- //
+ //
if (target=="build" && env.BRANCH_NAME!="release90") {
add=" -Ddo.build.windows.launchers=true"
}
-
+
// build the target on the cluster defined common to
all
sh "ant -f ${target}-${clustername}-temp/build.xml
${target} -Dcluster.config=${clustername} ${add}"
-
+
// for verify-libs-and-licenses we only want the
reports
if (target=='verify-libs-and-licenses') {
- junit
"verify-libs-and-licenses-${clustername}-temp/nbbuild/build/verifylibsandlicenses.xml"
+ junit
"verify-libs-and-licenses-${clustername}-temp/nbbuild/build/verifylibsandlicenses.xml"
}
-
+
// for rat we only want the reports (junit fail at the
moment empty test)
if (target=='rat') {
// save report and test for rat and verify..
archiveArtifacts
"rat-${clustername}-temp/nbbuild/build/rat-report.txt"
- junit testResults:
"rat-${clustername}-temp/nbbuild/build/rat/*.xml" , allowEmptyResults:true
+ junit testResults:
"rat-${clustername}-temp/nbbuild/build/rat/*.xml" , allowEmptyResults:true
}
-
+
// build target is more complex,
if (target=='build') {
// prepare versionned path
def versionnedpath = "/${path}/${versionpath}"
-
+
sh "mkdir -p dist${versionnedpath}"
// source
sh "cp nbbuild/build/*${clustername}*.zip
dist${versionnedpath}${path}-${rmversion}-source.zip"
// binaries
sh "cp
build-${clustername}-temp/nbbuild/*${clustername}*.zip
dist${versionnedpath}${path}-${rmversion}-bin.zip"
-
+
// special case for release prepare bits, maven,
javadoc installer
if (clustername == "release") {
-
+
// installer we prepare a folder so that
release manager can build mac os on his own
sh "mkdir -p dist${versionnedpath}nbms"
sh "mkdir -p dist/installers"
sh "mkdir -p
distpreparation${versionnedpath}installer"
-
+ sh "mkdir -p dist/vsix"
+
def installer = libraryResource
'org/apache/netbeans/installer.sh'
writeFile file:
"distpreparation${versionnedpath}installer/installer.sh", text: installer
-
+
def installermac = libraryResource
'org/apache/netbeans/installermac.sh'
writeFile file:
"distpreparation${versionnedpath}installer/installermac.sh", text: installermac
-
+
sh "chmod +x
distpreparation${versionnedpath}installer/installer.sh"
-
+
sh "mkdir -p
distpreparation${versionnedpath}installer/nbbuild/newbuild && cp
build-${clustername}-temp/nbbuild/newbuild/*
distpreparation${versionnedpath}installer/nbbuild/newbuild "
sh "mkdir -p
distpreparation${versionnedpath}installer/nbbuild/installer && cp -r
build-${clustername}-temp/nbbuild/installer
distpreparation${versionnedpath}installer/nbbuild "
sh "mkdir -p
distpreparation${versionnedpath}installer/nbi && cp -r
build-${clustername}-temp/nbi distpreparation${versionnedpath}installer "
sh "cp
build-${clustername}-temp/nbbuild/binaries-default-properties.xml
distpreparation${versionnedpath}installer/nbbuild/binaries-default-properties.xml
"
sh "mkdir -p
distpreparation${versionnedpath}installer/nbbuild/build/ && cp -r
build-${clustername}-temp/nbbuild/build/antclasses
distpreparation${versionnedpath}installer/nbbuild/build/antclasses "
-
+
sh "mkdir -p
distpreparation${versionnedpath}installer/nb/ide.launcher && cp -r
build-${clustername}-temp/nb/ide.launcher/macosx
distpreparation${versionnedpath}installer/nb/ide.launcher "
-
-
+
+
sh "cp
build-${clustername}-temp/nbbuild/*${clustername}*.zip
dist${versionnedpath}${path}-${rmversion}-bin.zip"
def binaryfile =
"${env.WORKSPACE}/dist${versionnedpath}${path}-${rmversion}-bin.zip"
- def timestamp = sh(returnStdout: true, script:
'date +%y%m%d').trim()
-
+ def timestamp = sh(returnStdout: true, script:
'date +%y%m%d').trim()
+
sh "cd
distpreparation${versionnedpath}installer && ./installer.sh ${binaryfile}
${version} ${timestamp}"
sh "cp
distpreparation${versionnedpath}installer/dist/bundles/* dist/installers/ "
sh "rm -rf
distpreparation${versionnedpath}installer/dist"
- archiveArtifacts 'distpreparation/**'
-
+ archiveArtifacts 'distpreparation/**'
+
// the installer phase is ok we should have
installer for linux / windows + scripts and a bit of source to build macos later
-
-
+
+
// 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-javadoc -Djavadoc.web.root='${apidocurl}'
-Dmodules-javadoc-date='${date}' -Datom-date='${atomdate}'
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
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"
-
+
withMaven(maven:tooling.myMaven,jdk:tooling.jdktool,publisherStrategy:
'EXPLICIT',mavenLocalRepo: localRepo,options:[artifactsPublisher(disabled:
true)])
{
sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get
-Dartifact=org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}
-Dmaven.repo.local=${env.WORKSPACE}/.repository
-DremoteRepositories=apache.snapshots.https::::https://repository.apache.org/snapshots";
def commonparam =
"-Dexternallist=${netbeansbase}/build/external.info"
//sh "mvn
org.apache.netbeans.utilities:nb-repository-plugin:1.5:download ${commonparam}
-DrepositoryUrl=https://repo.maven.apache.org/maven2";
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}/mavenrepository"
- }
+ }
archiveArtifacts 'mavenrepository/**'
-
+
+ // make vsix available to dist to pickup (only
for main release)
+ sh "ant -f
build-${clustername}-temp/java/java.lsp.server build-vscode-ext
-Dvsix.version=vsixversion"
+ sh "cp -r
build-${clustername}-temp/java/java.lsp.server/build/*.vsix
dist${versionnedpath}nbms/"
Review comment:
sorry didn't notice the diff was removing the trailing space.
I miss the correct folder to do the copy should be dist/vsix
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
