ci: remove old app folder

bndynet · bndynet · commit 4b834528680e · 2018-06-24T22:52:32.000+08:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,7 +6,8 @@ pipeline {
     }
 
     environment { 
-        DEPLOY_TARGET    = '../../../../websites/demo/wf.war'
+        APP_NAME     = 'wf'
+        DEPLOY_TO    = '../../../../websites/demo/'
         EMAIL_RECIPIENTS = 'zb@bndy.net'
         HAS_DEPLOYMENT   = 'false'
     }
@@ -39,8 +40,9 @@ pipeline {
             }
             steps {
                 echo 'Deploying....'
-                sh 'rm -f $DEPLOY_TARGET'
-                sh 'mv ./target/wf-*.war $DEPLOY_TARGET'
+                sh 'rm -f ${DEPLOY_TO}/${APP_NAME}.war'
+                sh 'rm -Rf $DEPLOY_TO'
+                sh 'mv ./target/wf-*.war ${DEPLOY_TO}/${APP_NAME}.war'
                 script {
                     HAS_DEPLOYMENT = 'true'
                 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@ pipeline {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`environment {`
`9`		`- DEPLOY_TARGET = '../../../../websites/demo/wf.war'`
	`9`	`+ APP_NAME = 'wf'`
	`10`	`+ DEPLOY_TO = '../../../../websites/demo/'`
`10`	`11`	`EMAIL_RECIPIENTS = 'zb@bndy.net'`
`11`	`12`	`HAS_DEPLOYMENT = 'false'`
`12`	`13`	`}`
`@@ -39,8 +40,9 @@ pipeline {`
`39`	`40`	`}`
`40`	`41`	`steps {`
`41`	`42`	`echo 'Deploying....'`
`42`		`- sh 'rm -f $DEPLOY_TARGET'`
`43`		`- sh 'mv ./target/wf-*.war $DEPLOY_TARGET'`
	`43`	`+ sh 'rm -f ${DEPLOY_TO}/${APP_NAME}.war'`
	`44`	`+ sh 'rm -Rf $DEPLOY_TO'`
	`45`	`+ sh 'mv ./target/wf-*.war ${DEPLOY_TO}/${APP_NAME}.war'`
`44`	`46`	`script {`
`45`	`47`	`HAS_DEPLOYMENT = 'true'`
`46`	`48`	`}`