Răsfoiți Sursa

Merge branch 'fix/jenkins_deploy_clear' into 'develop'

Merge of fix/jenkins_deploy_clear to develop 增加clear_deploy,重新部署不删除原来的数据和配置

See merge request o2oa/o2oa!397
胡起 5 ani în urmă
părinte
comite
ee12a4fba0
2 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 1 1
      Jenkinsfile_release
  2. 1 1
      gulpfile.js

+ 1 - 1
Jenkinsfile_release

@@ -11,7 +11,7 @@ pipeline {
         stage('init') {
         stage('init') {
             steps {
             steps {
                 bat 'npm install'
                 bat 'npm install'
-                bat 'npm run clear'
+                bat 'npm run clear_deploy'
             }
             }
         }
         }
         stage('dependency') {
         stage('dependency') {

+ 1 - 1
gulpfile.js

@@ -437,7 +437,6 @@ function clear_deploy(cb){
 ---------------------------------------------------------------------`);
 ---------------------------------------------------------------------`);
     var dest = ["target/o2server/store/", "target/o2server/commons/", "target/o2server/jvm/", "target/o2server/configSample/", "target/o2server/localSample/", "target/o2server/servers/"];
     var dest = ["target/o2server/store/", "target/o2server/commons/", "target/o2server/jvm/", "target/o2server/configSample/", "target/o2server/localSample/", "target/o2server/servers/"];
     dest = dest.concat(["target/o2server/*.sh", "target/o2server/*.jar", "target/o2server/*.html", "target/o2server/*.bat", "target/o2server/version.o2"]);
     dest = dest.concat(["target/o2server/*.sh", "target/o2server/*.jar", "target/o2server/*.html", "target/o2server/*.bat", "target/o2server/version.o2"]);
-    console.log(dest)
     del(dest, { force: true });
     del(dest, { force: true });
     cb();
     cb();
 }
 }
@@ -445,6 +444,7 @@ exports.clear_build = clear_build;
 exports.clear_deploy = clear_deploy;
 exports.clear_deploy = clear_deploy;
 
 
 
 
+
 function deploy_server(){
 function deploy_server(){
     console.log(`---------------------------------------------------------------------
     console.log(`---------------------------------------------------------------------
   . deploy to target ...
   . deploy to target ...