Repository: cordova-medic Updated Branches: refs/heads/master c9579c52f -> a4ad6cfd7
Make medic use master branch for plugins. Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/a4ad6cfd Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/a4ad6cfd Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/a4ad6cfd Branch: refs/heads/master Commit: a4ad6cfd7e2407b180dd7ca57b377f4af8ca7632 Parents: c9579c5 Author: Andrew Grieve <[email protected]> Authored: Wed Apr 30 10:44:17 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Wed Apr 30 10:44:17 2014 -0400 ---------------------------------------------------------------------- README.md | 9 +++++---- master.cfg | 8 ++++---- repos.json | 40 ++++++++++++++++++++-------------------- 3 files changed, 29 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a4ad6cfd/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 20066be..dde9925 100644 --- a/README.md +++ b/README.md @@ -97,18 +97,19 @@ every command has a link to its output o the main display. When a mobile spec te - Changes to tooling or the test scripts will trigger all tests. - Android tests: - - platform, mobilespec and js from master branch, plugins from dev branch (cordova-js is built and copied in) + - platform, mobilespec, js, and plugins from master branch (cordova-js is built and copied in) - platform and mobilspec 3.0.x branch with the cordova-js embedded in the cordova-android repo, plugins from master - iOS tests: - - platform, mobilespec and js from master branch, plugins from dev branch (cordova-js is built and copied in) + - platform, mobilespec, js, and plugins from master branch (cordova-js is built and copied in) - platform and mobilspec 3.0.x branch with the cordova-js embedded in the cordova-ios repo, plugins from master - Windows Phone8 tests: - - platform, mobilespec and js from master branch, plugins from dev branch (cordova-js is built and copied in) + - platform, mobilespec, js, and plugins from master branch (cordova-js is built and copied in) - Windows8 tests: - - platform, mobilespec and js from master branch, plugins from dev branch (cordova-js is built and copied in). Tests are executed on Local Machine, no support to run tests on connected device. + - platform, mobilespec, js, and plugins from master branch (cordova-js is built and copied in) + - Tests are executed on Local Machine, no support to run tests on connected device. The tests use COHO and CLI for as much as possible to ensure that the developer tool chain is working. http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a4ad6cfd/master.cfg ---------------------------------------------------------------------- diff --git a/master.cfg b/master.cfg index 3a96ee6..4f542a8 100644 --- a/master.cfg +++ b/master.cfg @@ -266,7 +266,7 @@ if(build_ios) : 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) factory_IOS_master.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_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=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master')) 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')) @@ -282,7 +282,7 @@ if(build_android) : factory_Android_master.addStep(ShellCommand(command=[shellCmd,shellRunParam,"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=[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_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=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master')) 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.addStep(ShellCommand(command=[shellCmd,shellRunParam,'[ -f "package.json" ] && npm install'],workdir='build/cordova-android/bin',haltOnFailure=True,description='NPM Install', descriptionDone='NPM Install')) factory_Android_master.addSteps(common_steps_mobilespec_1) @@ -301,7 +301,7 @@ if(build_wp8) : factory_wp8.addStep(ShellCommand(command=[shellCmd,shellRunParam,"node .\\cordova-coho\\coho repo-clone -r plugins -r mobile-spec -r wp8 -r js "],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone')) # TODO find the way to specify cli branch to clone for COHO, currently use step below factory_wp8.addStep(ShellCommand(command=[shellCmd,shellRunParam, "git clone -b " + branches['CLI'] + ' ' + repos['CLI'] + " cordova-cli"],workdir='build',haltOnFailure=True, description='Get CLI', descriptionDone='Get CLI')) - factory_wp8.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_wp8.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master')) factory_wp8.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')) # pach cordova-wp8 template to prevent app to lock the screen. In other case we won't be able to re-install the app next time. factory_wp8.addStep(ShellCommand(command=["node","medic\src\utils\patch_wp8_template.js"],workdir='build',haltOnFailure=True, description='Patch WP8 template',descriptionDone='Patch WP8 template')) @@ -322,7 +322,7 @@ if(build_windows8) : factory_windows8.addStep(ShellCommand(command=[shellCmd,shellRunParam,"node .\\cordova-coho\\coho repo-clone -r plugins -r mobile-spec -r windows -r js "],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone')) # TODO find the way to specify cli branch to clone for COHO, currently use step below factory_windows8.addStep(ShellCommand(command=[shellCmd,shellRunParam, "git clone -b " + branches['CLI'] + ' ' + repos['CLI'] + " cordova-cli"],workdir='build',haltOnFailure=True, description='Get CLI', descriptionDone='Get CLI')) - factory_windows8.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_windows8.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master')) factory_windows8.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_windows8.addSteps(common_steps_mobilespec_1) factory_windows8.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json')) http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a4ad6cfd/repos.json ---------------------------------------------------------------------- diff --git a/repos.json b/repos.json index 83bdb1b..b5291a7 100644 --- a/repos.json +++ b/repos.json @@ -10,7 +10,7 @@ { "title" : "Android Master Plugins", "categories" : ["PLUGIN"], - "branch" : "dev", + "branch" : "master", "builder": "Android_Master", "platform": "android" }, @@ -46,7 +46,7 @@ { "title" : "IOS Master Plugins", "categories" : ["PLUGIN"], - "branch" : "dev", + "branch" : "master", "builder": "IOS_Master", "platform": "ios" }, @@ -191,109 +191,109 @@ "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "CAMERA", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "CONSOLE", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-console.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "CONTACTS", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "DEVICE", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "DEVICEMOTION", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "DEVICEORIENTATION", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-device-orientation.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "DIALOGS", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "FILE", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-file.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "FILETRANSFER", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "GEOLOCATION", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-geolocation.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "GLOBALIZATION", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "INAPPBROWSER", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "MEDIA", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-media.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "MEDIACAPTURE", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "NETWORKINFO", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "SPLASHSCREEN", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" },{ "title" : "VIBRATION", "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration.git";, "category" : "PLUGIN", "release" : "master", - "current" :"dev" + "current" :"master" } ] }
