cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgreb...@apache.org
Subject [7/8] git commit: Added back logic to update cordova repos instead of re-cloning them
Date Wed, 05 Nov 2014 22:38:55 GMT
Added back logic to update cordova repos instead of re-cloning them


Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/93820649
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/93820649
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/93820649

Branch: refs/heads/master
Commit: 93820649a50c35d75cf9d2bcda8690296c10a767
Parents: 613e421
Author: sgrebnov <v-segreb@microsoft.com>
Authored: Wed Aug 6 15:52:28 2014 +0400
Committer: Vladimir Kotikov <v-vlkoti@microsoft.com>
Committed: Wed Oct 1 12:07:53 2014 +0400

----------------------------------------------------------------------
 master.cfg | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/93820649/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 3862406..df0830f 100644
--- a/master.cfg
+++ b/master.cfg
@@ -196,7 +196,7 @@ class PlatformTestBase(object):
     def init_workspace_steps(self):
         return [
             ShellCommand(command=["rm", "-rf", "~/.cordova/" + self.platform], workdir='build',
haltOnFailure=False, description='Remove cache'),
-            ShellCommand(command=["node", "-e", "require('child_process').exec('rm -rf medic
mobilespec/www mobilespec cordova-*')"], workdir='build', haltOnFailure=False, description='Clean
workdir'),
+            ShellCommand(command=["rm", "-rf", "medic", "mobilespec", "cordova-mobile-spec",
"cordova-coho", "cordova-cli", "cordova-lib"], workdir='build', haltOnFailure=False, description='Clean
workdir'),
             ShellCommand(command=["git", "clone", "-b", branches['TESTMASTER'], repos['TESTMASTER'],
"medic"], workdir='build', haltOnFailure=True, description='Get Medic'),
             # --production switch is used to speed up installation + fruitstrap dev dependency
is not supported on Windows
             ShellCommand(command=["npm", "install", "--production"], workdir='build/medic',
haltOnFailure=True, description='Install Medic'),
@@ -215,6 +215,7 @@ class PlatformTestBase(object):
             platform = "windows"
         return [
             ShellCommand(command=["./cordova-coho/coho", "repo-clone", "-r", "plugins", "-r",
"mobile-spec", "-r", platform, "-r", "js"], workdir='build', haltOnFailure=True, description='COHO
Clone'),
+            ShellCommand(command=["./cordova-coho/coho", "repo-update", "-r", "plugins",
"-r", "mobile-spec", "-r", platform, "-r", "js"], workdir='build', haltOnFailure=True, description='COHO
Update'),
             ShellCommand(command=["node", "medic/checkout.js", "--path=medic/repos.json",
"--cat=PLUGIN", "--releasebranch=" + branch_release], workdir='build', haltOnFailure=False,
description='Checkout Plugins'),
             ShellCommand(command=["node", "medic/checkout.js", "--path=medic/repos.json",
"--cat=PLATFORM", "--releasebranch=" + branch_release], workdir='build', haltOnFailure=False,
description='Checkout Platform'),
             ShellCommand(command=["node", "medic/checkout.js", "--path=medic/repos.json",
"--cat=JS", "--releasebranch=" + branch_release], workdir='build', haltOnFailure=False, description='Checkout
JS')
@@ -380,11 +381,12 @@ if(build_blackberry):
     factory_BlackBerry.addSteps(PlatformTest_Blackberry().get_all_steps())
     c['builders'].append(BuilderConfig(name="BlackBerry", slavenames=["blackberry-slave"],
factory=factory_BlackBerry))
 
-# TODO switch on
-# factory_cli = BuildFactory()
-# factory_cli.addStep(ShellCommand(command=["rm","-rf","cordova-*"],workdir='build',haltOnFailure=False,description='Cordova
Clean'))
-# factory_cli.addSteps(cli_steps)
-# c['builders'].append(BuilderConfig(name="Tools_CLI",slavenames=["common-slave"],factory=factory_cli))
+# TODO. temporary disable separate cli and plugman tests on Windows
+if not platform.system() == "Windows" :
+    factory_cli = BuildFactory()
+    factory_cli.addStep(ShellCommand(command=["rm","-rf","cordova-*"],workdir='build',haltOnFailure=False,description='Cordova
Clean'))
+    factory_cli.addSteps(cli_steps)
+    c['builders'].append(BuilderConfig(name="Tools_CLI",slavenames=["common-slave"],factory=factory_cli))
 
 #    factory_plugman = BuildFactory()
 #    factory_plugman.addSteps(plugman_steps)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message