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

[Jenkins][ci skip] Fix branch to v3 v2

This commit is contained in:
lm 2014-04-28 10:45:55 +08:00
parent 8e9b84517b
commit 575a7c988b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/jenkins-scripts/ci-release-test.py
View File

@ -55,7 +55,7 @@ def main():
pr_desc = '<h3>' + tag + ' is release' + '</h3>'
#get pr target branch
branch = 'develop'
branch = 'v3'
#set parent build description
jenkins_url = os.environ['JENKINS_URL']
@ -65,10 +65,10 @@ def main():
set_description(pr_desc, target_url)
#pull origin develop
#pull origin v3
os.system('git reset --hard')
os.system("git clean -xdf -f")
os.system("git checkout develop")
os.system("git checkout v3")
os.system("git branch -D " + tag)
os.system("git clean -xdf -f")
#fetch tag to local repo
@ -106,7 +106,7 @@ def main():
os.system('git reset --hard')
os.system("git clean -xdf -f")
make_temp_dir()
if(branch == 'develop'):
if(branch == 'v3'):
# Generate binding glue codes
ret = os.system("python tools/jenkins-scripts/gen_jsb.py")
if(ret != 0):
@ -139,7 +139,7 @@ def main():
os.system("cd " + os.environ['WORKSPACE'])
os.system("git reset --hard")
os.system("git clean -xdf -f")
os.system("git checkout develop")
os.system("git checkout v3")
return(exit_code)

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

@ -76,7 +76,7 @@ def main():
#reset path to workspace root
os.system("cd " + os.environ['WORKSPACE']);
os.system("git checkout develop")
os.system("git checkout v3")
os.system("git branch -D pull" + str(pr_num))
#clean workspace
print "Before checkout: git clean -xdf -f"
@ -102,9 +102,9 @@ def main():
return(2)
# Generate binding glue codes
if(branch == 'develop'):
if(branch == 'v3'):
ret = os.system("python tools/jenkins-scripts/gen_jsb.py")
elif(branch == 'master'):
elif(branch == 'v2'):
os.chdir('tools/tojs')
if(platform.system() == 'Windows'):
os.environ['NDK_ROOT'] = os.environ['NDK_ROOT_R8E']
@ -139,7 +139,7 @@ def main():
#TODO: add android-linux build
#TODO: add mac build
node_name = os.environ['NODE_NAME']
if(branch == 'develop'):
if(branch == 'v3'):
if(node_name == 'android_mac') or (node_name == 'android_win7'):
#modify tests/cpp-empty-test/Classes/AppDelegate.cpp to support Console
modify_file = 'tests/cpp-empty-test/Classes/AppDelegate.cpp'
@ -171,7 +171,7 @@ def main():
ret = os.system("cmake ../")
ret = os.system("make -j10")
os.chdir("../")
elif(branch == 'master'):
elif(branch == 'v2'):
SAMPLES_DIRS = ['Cpp/HelloCpp', 'Cpp/SimpleGame', 'Cpp/TestCpp', 'Javascript/TestJavascript', 'Lua/HelloLua', 'Lua/TestLua']
SAMPLES_NAMES = ['HelloCpp', 'SimpleGame', 'TestCpp', 'TestJavascript', 'HelloLua', 'TestLua']
if(node_name == 'android_mac'):
@ -215,7 +215,7 @@ def main():
os.system("cd " + os.environ['WORKSPACE'])
os.system("git reset --hard")
os.system("git clean -xdf -f")
os.system("git checkout develop")
os.system("git checkout v3")
os.system("git branch -D pull" + str(pr_num))
return(exit_code)