diff --git a/tools/jenkins-scripts/ci-release-test.py b/tools/jenkins-scripts/ci-release-test.py index 80d3c13065..6e83e92519 100644 --- a/tools/jenkins-scripts/ci-release-test.py +++ b/tools/jenkins-scripts/ci-release-test.py @@ -55,7 +55,7 @@ def main(): pr_desc = '

' + tag + ' is release' + '

' #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) diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index a77ac64c70..9941349e7a 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -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)