[jspwiki-site] branch jbake updated: checkout from master; ensure japicmp & apidocs don't leave garbage behind

[juanpablo]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git


The following commit(s) were added to refs/heads/jbake by this push:
     new af47ad3  checkout from master; ensure japicmp & apidocs don't leave 
garbage behind
af47ad3 is described below

commit af47ad3f847f6a47b94198fcd5be506ffa03dc47
Author: Juan Pablo Santos Rodríguez <juanpablo.san...@gmail.com>
AuthorDate: Tue Nov 23 20:16:39 2021 +0100

    checkout from master; ensure japicmp & apidocs don't leave garbage behind
---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f8bae24..6ed683b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,7 +43,7 @@ try {
         stage( 'generate apidocs & translations' ) {
             echo "Will use Java $JAVA_JDK_11"
             echo "Will use Maven $MAVEN_3_LATEST"
-            def gitVersion = version != 'master' ? "refs/tags/$version" : ''
+            def gitVersion = version != 'master' ? "refs/tags/$version" : 
'*/master'
 
             dir( build ) {
                 checkout( [
@@ -89,8 +89,8 @@ try {
             dir( asfsite ) {
                 git branch: asfsite, url: repo, credentialsId: creds
                 sh "cp -rf ../$jbake/target/content/* ./"
-                sh "mkdir -p ./japicmp/$docsVersion && cp -rf 
../$jbake/target/japicmp/* ./japicmp/$docsVersion"
-                sh "mkdir -p ./apidocs/$docsVersion && cp -rf 
../$build/target/site/apidocs/* ./apidocs/$docsVersion"
+                sh "rm -rf ./japicmp/$docsVersion && mkdir -p 
./japicmp/$docsVersion && cp -rf ../$jbake/target/japicmp/* 
./japicmp/$docsVersion"
+                sh "rm -rf ./apidocs/$docsVersion && mkdir -p 
./apidocs/$docsVersion && cp -rf ../$build/target/site/apidocs/* 
./apidocs/$docsVersion"
                 timeout( 15 ) { // 15 minutes
                     sh 'git add .'
                     sh 'git commit -m "Automatic Site Publish by Buildbot"'