[netbeans-jenkins-lib] branch master updated: test zip by sh

[sk...@apache.org]

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 e6354c9  test zip by sh
e6354c9 is described below

commit e6354c943a48ff2c6c594e28df41d65c2d87fc78
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Thu Sep 22 18:30:51 2022 +0200

    test zip by sh
---
 vars/asfStandardBuild.groovy | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vars/asfStandardBuild.groovy b/vars/asfStandardBuild.groovy
index 1406c26..d2d3160 100644
--- a/vars/asfStandardBuild.groovy
+++ b/vars/asfStandardBuild.groovy
@@ -35,8 +35,8 @@ def call(Map params = [:]) {
 	 jdk = 'jdk_11_latest'
     }
     // use the cmdLine parameter otherwise default depending on current branch
-    def cmdline = params.containsKey('cmdline') ? params.cmdline : (env.BRANCH_NAME == 'master'?"clean deploy site:jar":"clean install")
-    def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3.5.4'
+    def cmdline = params.containsKey('cmdline') ? params.cmdline : (env.BRANCH_NAME == 'master'?"clean deploy site:site site:stage":"clean install")
+    def mvnName = params.containsKey('mvnName') ? params.mvnName : 'maven_3_latest'
     def xvfb = params.containsKey('xvfb') ? true : false
 
     def defaultPublishers = [artifactsPublisher(disabled: false), junitPublisher(ignoreAttachments: false, disabled: false),
@@ -131,7 +131,7 @@ def mavenBuild(jdk, cmdline, mvnName, publishers) {
         mavenLocalRepo: localRepo) {
         // Some common Maven command line + provided command line
         sh "mvn -V -B -U -e -DskipBrowserTests -Dmaven.test.failure.ignore=true $cmdline "
-	sh "mv target/*-site.jar WEBSITE.zip"
+	sh "cd target/staging; zip ../../WEBSITE.zip ."
     }
     archiveArtifacts 'WEBSITE.zip'
 }


---------------------------------------------------------------------
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