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

[ci skip][jenkins]merge pull request to latest baseline before build

This commit is contained in:
heliclei 2014-07-25 16:38:22 +08:00
parent 03299cb76a
commit aba0a12413
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,6 +131,8 @@ def main():
#reset path to workspace root #reset path to workspace root
os.system("cd " + os.environ['WORKSPACE']); os.system("cd " + os.environ['WORKSPACE']);
#pull latest code
os.system("git pull origin V3")
os.system("git checkout v3") os.system("git checkout v3")
os.system("git branch -D pull" + str(pr_num)) os.system("git branch -D pull" + str(pr_num))
#clean workspace #clean workspace
@ -142,9 +144,16 @@ def main():
if(ret != 0): if(ret != 0):
return(2) return(2)
#checkout #checkout a new branch from v3
git_checkout = "git checkout -b " + "pull" + str(pr_num) + " FETCH_HEAD" git_checkout = "git checkout -b " + "pull" + str(pr_num)
os.system(git_checkout) os.system(git_checkout)
#merge pull reqeust head
p = os.popen('git merge --no-edit FETCH_HEAD')
r = p.read()
#check if merge fail
if r.find('CONFLICT') > 0:
print r
return(3)
# After checkout a new branch, clean workspace again # After checkout a new branch, clean workspace again
print "After checkout: git clean -xdf -f" print "After checkout: git clean -xdf -f"