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 2014/04/30 22:03:09 UTC
git commit: [CB-6572] remove Release builders
Repository: cordova-medic
Updated Branches:
refs/heads/master a4ad6cfd7 -> c9c17e53e
[CB-6572] remove Release builders
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/c9c17e53
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/c9c17e53
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/c9c17e53
Branch: refs/heads/master
Commit: c9c17e53ec5742d9812baca35d6b83f26366f5a2
Parents: a4ad6cf
Author: David Kemp <dr...@chromium.org>
Authored: Wed Apr 30 19:57:14 2014 +0000
Committer: David Kemp <dr...@chromium.org>
Committed: Wed Apr 30 19:57:14 2014 +0000
----------------------------------------------------------------------
master.cfg | 33 ++-------------------------------
repos.json | 42 ------------------------------------------
2 files changed, 2 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/c9c17e53/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 4f542a8..2bfc3b3 100644
--- a/master.cfg
+++ b/master.cfg
@@ -197,6 +197,8 @@ common_steps_mobilespec_1 = [
ShellCommand(command=[shellCmd,shellRunParam, "git clone -b " + branches['PLUGMAN'] + ' ' + repos['PLUGMAN'] + " plugman"],workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Update Plugman',descriptionDone='Update Plugman'),
ShellCommand(command=[shellCmd,shellRunParam,"rm -rf .git"],workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=False,description='Plugman Clean', descriptionDone='Plugman Clean'),
ShellCommand(command=["npm","install","--production"], workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=True,description='Install Plugman',descriptionDone='Install Plugman'),
+ ShellCommand(command=["rm","npm-shrinkwrap.json"],workdir='build/cordova-cli',haltOnFailure=False,description='Remove CLI SW',descriptionDone='Remove CLI SW'),
+ ShellCommand(command=["sed","-e","s/plugman\": \"0./plugman\": \">=0./","-i","bak","package.json"],workdir='build/cordova-cli',haltOnFailure=True,description='Edit Plugman pkg',descriptioDone='Edit Plugman pkg'),
ShellCommand(command=["npm","install","--production"],workdir='build/cordova-cli',haltOnFailure=True,description='Install CLI',descriptionDone='Install CLI'),
ShellCommand(command=["node", "cordova-cli/bin/cordova","create","mobilespec","org.apache.mobilespec","mobilespec"],workdir='build',haltOnFailure=True, description='CLI Create', descriptionDone='CLI Create')
]
@@ -232,36 +234,6 @@ common_steps_js = [
c['builders'] = []
if(build_ios) :
- factory_IOS = BuildFactory()
- factory_IOS.addStep(ShellCommand(command=[shellCmd,shellRunParam,"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=[shellCmd,shellRunParam,"./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","--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.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=MSPEC","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Mspec->release',descriptionDone='Mspec->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',name='Deploy IOS'))
- c['builders'].append(BuilderConfig(name="IOS_Release",slavenames=["ios-slave"], factory=factory_IOS))
-
-if(build_android) :
- factory_Android = BuildFactory()
- factory_Android.addStep(ShellCommand(command=[shellCmd,shellRunParam,"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=[shellCmd,shellRunParam,"./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","--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.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=MSPEC","--releasebranch="+branch_release,"--release"],workdir='build',haltOnFailure=False,description='Mspec->release',descriptionDone='Mspec->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'))
- factory_Android.addSteps(common_steps_mobilespec_2)
- factory_Android.addStep(ShellCommand(command=["node", "medic/build_android.js", "--branch="+branch_release], workdir='build', timeout=600,description='Deploy Android',descriptionDone='Deploy Android',name='Deploy Android'))
- c['builders'].append(BuilderConfig(name="Android_Release",slavenames=["android-slave"],factory=factory_Android))
-
-if(build_ios) :
factory_IOS_master = BuildFactory()
factory_IOS_master.addStep(ShellCommand(command=[shellCmd,shellRunParam,"rm -rf ~/.cordova/lib/ios"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
factory_IOS_master.addSteps(common_steps_1)
@@ -367,7 +339,6 @@ if build_chrome :
factory_chrome_mobile.addStep(ShellCommand(command=["git","clone","--recurse-submodules",repos['CCA']],workdir='build',haltOnFailure=True, description='Fetch cca',descriptionDone='Fetch cca'))
factory_chrome_mobile.addStep(ShellCommand(command=["npm","install"],workdir='build/mobile-chrome-apps',haltOnFailure=True, description='Install cca',descriptionDone='Install cca'))
factory_chrome_mobile.addStep(ShellCommand(command=["rm","-rf","ccatest"],workdir='build',haltOnFailure=True, description='Clean ccatest',descriptionDone='Clean ccatest'))
- factory_chrome_mobile.addStep(ShellCommand(command=["mobile-chrome-apps/src/cca.js","init"],workdir='build',haltOnFailure=True, description='cca init',descriptionDone='cca init'))
factory_chrome_mobile.addStep(ShellCommand(command=["mobile-chrome-apps/src/cca.js","create","ccatest","--copy-from","mobile-chrome-apps/chrome-cordova/chrome-apps-api-tests"],workdir='build',haltOnFailure=True, description='cca create',descriptionDone='cca create'))
factory_chrome_mobile.addStep(ShellCommand(command=["node","../medic/runner/testrunner.js","--ip=192.168.1.122","--port=6800","--cmd=../medic/runner/runcca.sh","--path=www","--args=android"],workdir='build/ccatest',timeout=300,haltOnFailure=True, description='Run Mobile',descriptionDone='Run Mobile'))
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/c9c17e53/repos.json
----------------------------------------------------------------------
diff --git a/repos.json b/repos.json
index b5291a7..8e208cd 100644
--- a/repos.json
+++ b/repos.json
@@ -13,27 +13,6 @@
"branch" : "master",
"builder": "Android_Master",
"platform": "android"
- },
- {
- "title" : "Android Release Platform",
- "categories" : ["ANDROID"],
- "branch" : "RELEASE",
- "builder": "Android_Release",
- "platform": "android"
- },
- {
- "title" : "Android Release Tools",
- "categories" : ["CLI","PLUGMAN","COHO","TESTMASTER","MSPEC"],
- "branch" : "master",
- "builder": "Android_Release",
- "platform": "android"
- },
- {
- "title" : "Android Release Plugins",
- "categories" : ["PLUGIN"],
- "branch" : "master",
- "builder": "Android_Release",
- "platform": "android"
}
,
{
@@ -51,27 +30,6 @@
"platform": "ios"
},
{
- "title" : "IOS Release Platform",
- "categories" : ["IOS"],
- "branch" : "RELEASE",
- "builder": "IOS_Release",
- "platform": "ios"
- },
- {
- "title" : "IOS Release Tools",
- "categories" : ["CLI","PLUGMAN","COHO","TESTMASTER","MSPEC"],
- "branch" : "master",
- "builder": "IOS_Release",
- "platform": "ios"
- },
- {
- "title" : "IOS Release Plugins",
- "categories" : ["PLUGIN"],
- "branch" : "master",
- "builder": "IOS_Release",
- "platform": "ios"
- },
- {
"title" : "Windows Phone8 master",
"categories" : ["WP8"],
"branch" : "master",