Skip to content

G
global-jenkinsfile
Commit 708334e5 authored by wentao.suo's avatar wentao.suo
Browse files
Options

change post-merge to post-checkout

parent 27a27bcd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/org/qg/docker_new/StageBucket.groovy
View file @ 708334e5
...@@ -124,7 +124,7 @@ def checkout_nodejs(systemName, branchName) { ...@@ -124,7 +124,7 @@ def checkout_nodejs(systemName, branchName) {
sh "npm install" sh "npm install"
} else { } else {
sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-checkout .git/hooks/" sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-checkout .git/hooks/"
sh "chmod +x .git/hooks/post-merge" sh "chmod +x .git/hooks/post-checkout"
git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
} }
...@@ -151,7 +151,7 @@ def checkout_luaui(systemName, branchName) { ...@@ -151,7 +151,7 @@ def checkout_luaui(systemName, branchName) {
sh "npm install" sh "npm install"
} else { } else {
sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-checkout .git/hooks/" sh "cp -rf /home/quant_group/config_repository/lua-ui/hook/post-checkout .git/hooks/"
sh "chmod +x .git/hooks/post-merge" sh "chmod +x .git/hooks/post-checkout"
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'
......
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