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 cd5fdf0 take jdk also
cd5fdf0 is described below
commit cd5fdf04cf57625d639d282e1bf33beb2acbd43b
Author: Eric Barboni <[email protected]>
AuthorDate: Fri May 17 15:20:44 2019 +0200
take jdk also
---
vars/asfMainNetBeansBuild.groovy | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 8666db6..54dc976 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -26,7 +26,7 @@ def call(Map params = [:]) {
def apidocurl = ""
def date = ""
def atomdate = ""
-
+ def jdktool = ""
pipeline {
options {
buildDiscarder(logRotator(numToKeepStr: '1'))
@@ -44,22 +44,23 @@ def call(Map params = [:]) {
echo "curl over"
// write a custom json with valid data
writeFile(file: 'test.json', text: '{ "release90":
{ "ant": "Ant (latest)", "jdk": "JDK 1.8 (latest)",
"maven": "Maven 3.3.9", "releaseDate": "29 Jul 2018",
"atomreleaseDate": "2018-07-29T12:00:00Z", "tlp": "false",
"apidocurl": "https://bits.netbeans.org/9.0/javadoc";
}, "release100": { "ant": "Ant (latest)", "jdk": "JDK 1.8
(latest)", "maven": "Maven 3.3.9", [...]
- echo "write over"
def foo = readJSON file: 'test.json'
- echo "readjs over"
-
sh 'rm -f test.json'
- echo "remove over"
+
myAnt = foo[env.BRANCH_NAME].ant;
apidocurl = foo[env.BRANCH_NAME].apidocurl
date = foo[env.BRANCH_NAME].releaseDate
atomdate = foo[env.BRANCH_NAME].atomreleaseDate
- echo "echo over"
+ jdktool = foo[env.BRANCH_NAME].jdk
+
}
}
}
stage ("Apidoc") {
+ tools {
+ jdk jdktool
+ }
steps {
withAnt(installation: myAnt) {
script {
---------------------------------------------------------------------
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
