Commit 54a7d8f9 authored by wentao.suo's avatar wentao.suo

fix

parent ad75008b
...@@ -338,8 +338,12 @@ def build_luaui( systemName, contextDir) { ...@@ -338,8 +338,12 @@ def build_luaui( systemName, contextDir) {
currentPath = sh (script: 'pwd',returnStdout: true).trim() currentPath = sh (script: 'pwd',returnStdout: true).trim()
sh "mv -f ./${systemName}.env.config ${configPath}" sh "mv -f ./${systemName}.env.config ${configPath}"
if(systemName=='xjd-ui' && branchName == 'apollo'){
sh "npm run build"
} else {
sh buildCmd sh buildCmd
}
sh "tar zcf ${systemName}.tgz dist/" sh "tar zcf ${systemName}.tgz dist/"
sh "mv ${systemName}.tgz ${contextDir}" sh "mv ${systemName}.tgz ${contextDir}"
...@@ -510,8 +514,13 @@ def cpb(buildType,systemName,branchName,contextDir){ ...@@ -510,8 +514,13 @@ def cpb(buildType,systemName,branchName,contextDir){
} }
/*prepare config*/ /*prepare config*/
stage('Prepare') { stage('Prepare') {
if(systemName=='xjd-ui' && branchName == 'apollo'){
_utils().beautyEcho("xjd-ui : apollo not exec prepare_config", "info")
} else{
prepare_config(buildType, systemName, contextDir) prepare_config(buildType, systemName, contextDir)
} }
}
/*build*/ /*build*/
stage('Build'){ stage('Build'){
build(buildType, systemName, contextDir) build(buildType, systemName, contextDir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment