[webkit-changes] [264353] trunk/Tools

Tue, 14 Jul 2020 11:00:13 -0700

Title: [264353] trunk/Tools
Revision
264353
Author
aakash_j...@apple.com
Date
2020-07-14 10:59:12 -0700 (Tue, 14 Jul 2020)

Log Message

[ews] Do not upload archives for tvOS and watchOS
https://bugs.webkit.org/show_bug.cgi?id=214305

Reviewed by Jonathan Bedard.

* BuildSlaveSupport/ews-build/factories.py:
(BuildFactory):
(BuildFactory.__init__):
(watchOSBuildFactory):
(tvOSBuildFactory):

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (264352 => 264353)


--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py	2020-07-14 17:55:57 UTC (rev 264352)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py	2020-07-14 17:59:12 UTC (rev 264353)
@@ -95,12 +95,14 @@
 
 
 class BuildFactory(Factory):
+    skipUpload = False
+
     def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs):
         Factory.__init__(self, platform=platform, configuration=configuration, architectures=architectures, buildOnly=False, triggers=triggers, additionalArguments=additionalArguments)
         self.addStep(KillOldProcesses())
         if platform == 'gtk':
             self.addStep(InstallGtkDependencies())
-        self.addStep(CompileWebKit())
+        self.addStep(CompileWebKit(skipUpload=self.skipUpload))
 
 
 class TestFactory(Factory):
@@ -164,11 +166,11 @@
 
 
 class watchOSBuildFactory(BuildFactory):
-    pass
+    skipUpload = True
 
 
 class tvOSBuildFactory(BuildFactory):
-    pass
+    skipUpload = True
 
 
 class macOSWK1Factory(TestFactory):

Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py (264352 => 264353)


--- trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py	2020-07-14 17:55:57 UTC (rev 264352)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py	2020-07-14 17:59:12 UTC (rev 264353)
@@ -167,7 +167,7 @@
             _BuildStepFactory(steps.CheckOutSpecificRevision),
             _BuildStepFactory(steps.ApplyPatch),
             _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit),
+            _BuildStepFactory(steps.CompileWebKit, skipUpload=False),
         ])
 
     def test_ios_build_factory(self):
@@ -180,11 +180,11 @@
             _BuildStepFactory(steps.CheckOutSpecificRevision),
             _BuildStepFactory(steps.ApplyPatch),
             _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit),
+            _BuildStepFactory(steps.CompileWebKit, skipUpload=False),
         ])
 
     def test_watchos_build_factory(self):
-        factory = factories.iOSBuildFactory(platform='watchos-6', configuration='release', architectures=["arm64_32"])
+        factory = factories.watchOSBuildFactory(platform='watchos-6', configuration='release', architectures=["arm64_32"])
         self.assertBuildSteps(factory.steps, [
             _BuildStepFactory(steps.ConfigureBuild, platform='watchos-6', configuration='release', architectures=["arm64_32"], buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
             _BuildStepFactory(steps.ValidatePatch),
@@ -193,11 +193,11 @@
             _BuildStepFactory(steps.CheckOutSpecificRevision),
             _BuildStepFactory(steps.ApplyPatch),
             _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit),
+            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
         ])
 
     def test_tvos_build_factory(self):
-        factory = factories.iOSBuildFactory(platform='tvos-13', configuration='release', architectures=["arm64"])
+        factory = factories.tvOSBuildFactory(platform='tvos-13', configuration='release', architectures=["arm64"])
         self.assertBuildSteps(factory.steps, [
             _BuildStepFactory(steps.ConfigureBuild, platform='tvos-13', configuration='release', architectures=["arm64"], buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
             _BuildStepFactory(steps.ValidatePatch),
@@ -206,7 +206,7 @@
             _BuildStepFactory(steps.CheckOutSpecificRevision),
             _BuildStepFactory(steps.ApplyPatch),
             _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit),
+            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
         ])
 
     def test_jsc_mipsel_factory(self):

Modified: trunk/Tools/ChangeLog (264352 => 264353)


--- trunk/Tools/ChangeLog	2020-07-14 17:55:57 UTC (rev 264352)
+++ trunk/Tools/ChangeLog	2020-07-14 17:59:12 UTC (rev 264353)
@@ -1,3 +1,16 @@
+2020-07-14  Aakash Jain  <aakash_j...@apple.com>
+
+        [ews] Do not upload archives for tvOS and watchOS
+        https://bugs.webkit.org/show_bug.cgi?id=214305
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/factories.py:
+        (BuildFactory):
+        (BuildFactory.__init__):
+        (watchOSBuildFactory):
+        (tvOSBuildFactory):
+
 2020-07-14  Karl Rackler  <rack...@apple.com>
 
         Add myself to contributors.json.

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to