Commit 07c8a3be authored by daidekun's avatar daidekun

fixbugs

parent aa6db8ce
...@@ -92,7 +92,6 @@ def checkout_lua_ui(branchName, gitRepo) { ...@@ -92,7 +92,6 @@ def checkout_lua_ui(branchName, gitRepo) {
dir (projects[it]) { dir (projects[it]) {
project_attr = project_attr(projects[it]) project_attr = project_attr(projects[it])
git_path = project_attr["gitPath"] git_path = project_attr["gitPath"]
build_cmd = project_attr["buildCmd"]
currentPath = sh ( currentPath = sh (
script: 'pwd', script: 'pwd',
...@@ -108,7 +107,7 @@ def checkout_lua_ui(branchName, gitRepo) { ...@@ -108,7 +107,7 @@ def checkout_lua_ui(branchName, gitRepo) {
if (bowerFile) { if (bowerFile) {
sh "bower install --allow-root" sh "bower install --allow-root"
} }
sh build_cmd sh "npm install"
}else{ }else{
sh "\\cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/" sh "\\cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
sh "chmod +x .git/hooks/post-merge" sh "chmod +x .git/hooks/post-merge"
...@@ -124,7 +123,6 @@ def checkout_lua_ui(branchName, gitRepo) { ...@@ -124,7 +123,6 @@ def checkout_lua_ui(branchName, gitRepo) {
dir (project) { dir (project) {
project_attr = project_attr(project) project_attr = project_attr(project)
git_path = project_attr["gitPath"] git_path = project_attr["gitPath"]
build_cmd = project_attr["buildCmd"]
currentPath = sh ( currentPath = sh (
script: 'pwd', script: 'pwd',
...@@ -140,7 +138,7 @@ def checkout_lua_ui(branchName, gitRepo) { ...@@ -140,7 +138,7 @@ def checkout_lua_ui(branchName, gitRepo) {
if (bowerFile) { if (bowerFile) {
sh "bower install --allow-root" sh "bower install --allow-root"
} }
sh build_cmd sh "npm install"
}else{ }else{
sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/" sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
sh "chmod +x .git/hooks/post-merge" sh "chmod +x .git/hooks/post-merge"
......
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