You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dr...@apache.org on 2013/10/15 20:40:00 UTC
[19/31] git commit: fixed release tagging
fixed release tagging
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/f23b09c9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/f23b09c9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/f23b09c9
Branch: refs/heads/master
Commit: f23b09c99e4ec89c785752841a11a5473832c4b6
Parents: eaeb151
Author: David Kemp <dr...@google.com>
Authored: Mon Aug 26 15:13:10 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Tue Oct 15 14:12:59 2013 -0400
----------------------------------------------------------------------
checkout.js | 3 +++
master.cfg | 18 +++++++++---------
repos.json | 18 ++++++++++++++++--
3 files changed, 28 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/f23b09c9/checkout.js
----------------------------------------------------------------------
diff --git a/checkout.js b/checkout.js
index ff78120..8fc2f9c 100644
--- a/checkout.js
+++ b/checkout.js
@@ -7,6 +7,7 @@ var argv = require('optimist').argv;
var CAT='TOOLS';
var isRelease=false;
var jsonpath ='./repos.json';
+var branch_release = 'release';
function getDir(reponame) {
return path.basename(reponame,'.git');
@@ -15,6 +16,7 @@ function getDir(reponame) {
if(argv.cat) CAT=argv.cat;
if(argv.release) isRelease=true;
if(argv.path) jsonpath=argv.path;
+if(argv.releasebranch) branch_release= argv.releasebranch;
var repos = JSON.parse(fs.readFileSync(jsonpath, 'utf8'));
@@ -23,6 +25,7 @@ repos.repos.forEach( function(repo) {
if(repo.category == CAT) {
var branch = repo.current;
if(isRelease) branch = repo.release;
+ if(branch =="RELEASE") branch = branch_release;
var dir = getDir(repo.repo);
if(fs.existsSync(dir) && fs.statSync(dir).isDirectory() ) {
shell.pushd(dir);
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/f23b09c9/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index a14b428..020a435 100644
--- a/master.cfg
+++ b/master.cfg
@@ -157,13 +157,13 @@ if(build_ios) :
factory_IOS.addStep(ShellCommand(command=["/bin/sh","-c","rm -rf ~/.cordova/lib/ios"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_IOS.addSteps(common_steps_1)
factory_IOS.addStep(ShellCommand(command=["/bin/sh","-c","./cordova-coho/coho repo-clone -r plugins -r mobile-spec -r ios -r cli -r js "],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
- factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--release"],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
- factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--release"],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->release'))
+ factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
+ factory_IOS.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->release'))
factory_IOS.addSteps(common_steps_mobilespec_1)
factory_IOS.addStep(ShellCommand(command=["node","medic/writejson.js","--branch="+branch_release],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json'))
factory_IOS.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","ios"],workdir='build/mobilespec',haltOnFailure=True,description='Platform Add',descriptionDone='Platform Add'))
factory_IOS.addSteps(common_steps_mobilespec_2)
- factory_IOS.addStep(ShellCommand(command=["node", "medic/build_ios.js","--branch="+branch_release], workdir='build', timeout=600,description='Deploy IOS',descriptionDone='Deploy IOS'))
+ factory_IOS.addStep(ShellCommand(command=["node", "medic/build_ios.js","--branch="+branch_release], workdir='build', timeout=600,description='Deploy IOS',descriptionDone='Deploy IOS',name='Deploy IOS'))
c['builders'].append(BuilderConfig(name="IOS_Release",slavenames=["ios-slave"], factory=factory_IOS))
if(build_android) :
@@ -171,8 +171,8 @@ if(build_android) :
factory_Android.addStep(ShellCommand(command=["/bin/sh","-c","rm -rf ~/.cordova/lib/android"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_Android.addSteps(common_steps_1)
factory_Android.addStep(ShellCommand(command=["/bin/sh","-c","./cordova-coho/coho repo-clone -r plugins -r mobile-spec -r android -r cli -r js "],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
- factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--release"],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
- factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--release"],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->release'))
+ factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
+ factory_Android.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Platform->release',descriptionDone='Platform->release'))
factory_Android.addSteps(common_steps_mobilespec_1)
factory_Android.addStep(ShellCommand(command=["node","medic/writejson.js","--branch="+branch_release],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json'))
factory_Android.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","android"],workdir='build/mobilespec',haltOnFailure=True,description='Platform Add',descriptionDone='Platform Add'))
@@ -185,8 +185,8 @@ if(build_ios) :
factory_IOS_master.addStep(ShellCommand(command=["/bin/sh","-c","rm -rf ~/.cordova/lib/ios"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_IOS_master.addSteps(common_steps_1)
factory_IOS_master.addStep(ShellCommand(command=["/bin/sh","-c","./cordova-coho/coho repo-clone -r plugins -r mobile-spec -r ios -r cli -r js "],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
- factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN"],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
- factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM"],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
+ factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
+ factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
factory_IOS_master.addSteps(common_steps_mobilespec_1)
factory_IOS_master.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json'))
factory_IOS_master.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","ios"],workdir='build/mobilespec',haltOnFailure=True, description='Platform Add',descriptionDone='Platform Add'))
@@ -201,8 +201,8 @@ if(build_android) :
factory_Android_master.addStep(ShellCommand(command=["/bin/sh","-c","rm -rf ~/.cordova/lib/android"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_Android_master.addSteps(common_steps_1)
factory_Android_master.addStep(ShellCommand(command=["/bin/sh","-c","./cordova-coho/coho repo-clone -r plugins -r mobile-spec -r android -r cli -r js "],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
- factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN"],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
- factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM"],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
+ factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
+ factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
factory_Android_master.addSteps(common_steps_mobilespec_1)
factory_Android_master.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json'))
factory_Android_master.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","android"],workdir='build/mobilespec',haltOnFailure=True, description='Platform Add',descriptionDone='Platform Add'))
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/f23b09c9/repos.json
----------------------------------------------------------------------
diff --git a/repos.json b/repos.json
index 3c240a3..3ce5b61 100644
--- a/repos.json
+++ b/repos.json
@@ -16,12 +16,19 @@
},
{
"title" : "Android Release Platform",
- "categories" : ["ANDROID","TOOLS","MSPEC","TESTMASTER","JS"],
+ "categories" : ["ANDROID","MSPEC"],
"branch" : "RELEASE",
"builder": "Android_Release",
"platform": "android"
},
{
+ "title" : "Android Release Tools",
+ "categories" : ["TOOLS","TESTMASTER"],
+ "branch" : "master",
+ "builder": "Android_Release",
+ "platform": "android"
+ },
+ {
"title" : "Android Release Plugins",
"categories" : ["PLUGIN"],
"branch" : "master",
@@ -45,12 +52,19 @@
},
{
"title" : "IOS Release Platform",
- "categories" : ["IOS","TOOLS","MSPEC","TESTMASTER","JS"],
+ "categories" : ["IOS","MSPEC"],
"branch" : "RELEASE",
"builder": "IOS_Release",
"platform": "ios"
},
{
+ "title" : "IOS Release Tools",
+ "categories" : ["TOOLS","TESTMASTER"],
+ "branch" : "master",
+ "builder": "IOS_Release",
+ "platform": "ios"
+ },
+ {
"title" : "IOS Release Plugins",
"categories" : ["PLUGIN"],
"branch" : "master",