Commit 6f0edd77 authored by wentao.suo's avatar wentao.suo

ffff

parent fda9bf2d
...@@ -109,26 +109,28 @@ def checkout_java(systemName, branchName) { ...@@ -109,26 +109,28 @@ def checkout_java(systemName, branchName) {
def checkout_nodejs(systemName, branchName) { def checkout_nodejs(systemName, branchName) {
def projectAttr = project_attr(systemName) def projectAttr = project_attr(systemName)
def gitPath =projectAttr["gitPath"] def gitPath =projectAttr["gitPath"]
/*currentPath = sh ( currentPath = sh (
script: 'pwd', script: 'pwd',
returnStdout: true returnStdout: true
).trim() ).trim()
def folder = new File( "${currentPath}/.git/hooks" )*/ def folder = new File( "${currentPath}/.git/hooks" )
sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/" if( !folder.exists(){
sh "chmod +x .git/hooks/post-merge"
git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
def bowerFile = fileExists './bower.json' def bowerFile = fileExists './bower.json'
if (bowerFile) { if (bowerFile) {
sh "bower install --allow-root" sh "bower install --allow-root"
} }
sh "npm install" sh "npm install"
} else{
sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
sh "chmod +x .git/hooks/post-merge"
git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
}
} }
...@@ -139,24 +141,33 @@ def checkout_luaui(systemName, branchName) { ...@@ -139,24 +141,33 @@ def checkout_luaui(systemName, branchName) {
_utils().beautyEcho("ui project : ${systemName}" , "info") _utils().beautyEcho("ui project : ${systemName}" , "info")
projectAttr = project_attr(systemName) projectAttr = project_attr(systemName)
gitPath = projectAttr["gitPath"] gitPath = projectAttr["gitPath"]
currentPath = sh (
/*currentPath = sh (
script: 'pwd', script: 'pwd',
returnStdout: true returnStdout: true
).trim() ).trim()
def folder = new File( "${currentPath}/.git/hooks" )
if( !folder.exists(){
git branch: branches[it], credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
def bowerFile = fileExists './bower.json'
if (bowerFile) {
sh "bower install --allow-root"
}
sh "npm install"
} else{
sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
sh "chmod +x .git/hooks/post-merge"
def folder = new File( "${currentPath}/.git/hooks" )*/ git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
def bowerFile = fileExists './bower.json'
sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-merge .git/hooks/"
sh "chmod +x .git/hooks/post-merge"
git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
def bowerFile = fileExists './bower.json'
if (bowerFile) { if (bowerFile) {
sh "bower install --allow-root" sh "bower install --allow-root"
}
sh "npm install"
} }
sh "npm install"
} }
......
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