Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6173 from lmskater/fix-git-fail-return-value 

[Jenkins][ci skip]: Modified the return value when git fails, it's used for `ci rebuild`
This commit is contained in:
James Chen 2014-04-08 17:32:31 +08:00
parent 0c2b654410 ca9b4a3196
commit 02507ce25f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/jenkins-scripts/pull-request-builder.py
View File

@ -85,7 +85,7 @@ def main():
git_fetch_pr = "git fetch origin pull/" + str(pr_num) + "/merge" git_fetch_pr = "git fetch origin pull/" + str(pr_num) + "/merge"
ret = os.system(git_fetch_pr) ret = os.system(git_fetch_pr)
if(ret != 0): if(ret != 0):
return(1) return(2)
#checkout #checkout
git_checkout = "git checkout -b " + "pull" + str(pr_num) + " FETCH_HEAD" git_checkout = "git checkout -b " + "pull" + str(pr_num) + " FETCH_HEAD"
@ -99,7 +99,7 @@ def main():
git_update_submodule = "git submodule update --init --force" git_update_submodule = "git submodule update --init --force"
ret = os.system(git_update_submodule) ret = os.system(git_update_submodule)
if(ret != 0): if(ret != 0):
return(1) return(2)
# Generate binding glue codes # Generate binding glue codes
if(branch == 'develop'): if(branch == 'develop'):