Title: [265053] trunk/Tools
Revision
265053
Author
[email protected]
Date
2020-07-29 14:02:50 -0700 (Wed, 29 Jul 2020)

Log Message

[ews.webkit.org] Skip build upload for embedded iOS builds
https://bugs.webkit.org/show_bug.cgi?id=214923

Reviewed by Aakash Jain.

* BuildSlaveSupport/ews-build/config.json: Skip upload for iOS Embedded builds.
* BuildSlaveSupport/ews-build/factories.py:
(iOSEmbeddedBuildFactory): Skip building and uploading product archive.

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (265052 => 265053)


--- trunk/Tools/BuildSlaveSupport/ews-build/config.json	2020-07-29 20:24:46 UTC (rev 265052)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json	2020-07-29 21:02:50 UTC (rev 265053)
@@ -356,7 +356,7 @@
       "name": "iOS-13-Build-EWS",
       "shortname": "ios",
       "icon": "buildOnly",
-      "factory": "iOSBuildFactory",
+      "factory": "iOSEmbeddedBuildFactory",
       "platform": "ios-13",
       "configuration": "release",
       "architectures": ["arm64"],

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


--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py	2020-07-29 20:24:46 UTC (rev 265052)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py	2020-07-29 21:02:50 UTC (rev 265053)
@@ -156,6 +156,10 @@
     pass
 
 
+class iOSEmbeddedBuildFactory(BuildFactory):
+    skipUpload = True
+
+
 class iOSTestsFactory(TestFactory):
     LayoutTestClass = RunWebKitTests
     willTriggerCrashLogSubmission = True

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


--- trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py	2020-07-29 20:24:46 UTC (rev 265052)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py	2020-07-29 21:02:50 UTC (rev 265053)
@@ -171,9 +171,9 @@
         ])
 
     def test_ios_build_factory(self):
-        factory = factories.iOSBuildFactory(platform='ios-13', configuration='release', architectures=["arm64"])
+        factory = factories.iOSBuildFactory(platform='ios-simulator-13', configuration='release', architectures=["x86_64"])
         self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='ios-13', configuration='release', architectures=["arm64"], buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
+            _BuildStepFactory(steps.ConfigureBuild, platform='ios-simulator-13', configuration='release', architectures=["x86_64"], buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
             _BuildStepFactory(steps.ValidatePatch),
             _BuildStepFactory(steps.PrintConfiguration),
             _BuildStepFactory(steps.CheckOutSource),
@@ -183,6 +183,19 @@
             _BuildStepFactory(steps.CompileWebKit, skipUpload=False),
         ])
 
+    def test_ios_embedded_build_factory(self):
+        factory = factories.iOSEmbeddedBuildFactory(platform='ios-13', configuration='release', architectures=["arm64"])
+        self.assertBuildSteps(factory.steps, [
+            _BuildStepFactory(steps.ConfigureBuild, platform='ios-13', configuration='release', architectures=["arm64"], buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
+            _BuildStepFactory(steps.ValidatePatch),
+            _BuildStepFactory(steps.PrintConfiguration),
+            _BuildStepFactory(steps.CheckOutSource),
+            _BuildStepFactory(steps.CheckOutSpecificRevision),
+            _BuildStepFactory(steps.ApplyPatch),
+            _BuildStepFactory(steps.KillOldProcesses),
+            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
+        ])
+
     def test_watchos_build_factory(self):
         factory = factories.watchOSBuildFactory(platform='watchos-6', configuration='release', architectures=["arm64_32"])
         self.assertBuildSteps(factory.steps, [

Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py (265052 => 265053)


--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py	2020-07-29 20:24:46 UTC (rev 265052)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py	2020-07-29 21:02:50 UTC (rev 265053)
@@ -32,7 +32,7 @@
 
 from factories import (APITestsFactory, BindingsFactory, BuildFactory, CommitQueueFactory, Factory, GTKBuildFactory,
                        GTKTestsFactory, JSCBuildFactory, JSCBuildAndTestsFactory, StyleFactory, TestFactory, tvOSBuildFactory,
-                       WPEFactory, WebKitPerlFactory, WebKitPyFactory, WinCairoFactory, WindowsFactory, iOSBuildFactory, iOSTestsFactory,
+                       WPEFactory, WebKitPerlFactory, WebKitPyFactory, WinCairoFactory, WindowsFactory, iOSBuildFactory, iOSEmbeddedBuildFactory, iOSTestsFactory,
                        macOSBuildFactory, macOSWK1Factory, macOSWK2Factory, ServicesFactory, WatchListFactory, watchOSBuildFactory)
 
 BUILDER_NAME_LENGTH_LIMIT = 70

Modified: trunk/Tools/ChangeLog (265052 => 265053)


--- trunk/Tools/ChangeLog	2020-07-29 20:24:46 UTC (rev 265052)
+++ trunk/Tools/ChangeLog	2020-07-29 21:02:50 UTC (rev 265053)
@@ -1,5 +1,16 @@
 2020-07-29  Jonathan Bedard  <[email protected]>
 
+        [ews.webkit.org] Skip build upload for embedded iOS builds
+        https://bugs.webkit.org/show_bug.cgi?id=214923
+
+        Reviewed by Aakash Jain.
+
+        * BuildSlaveSupport/ews-build/config.json: Skip upload for iOS Embedded builds.
+        * BuildSlaveSupport/ews-build/factories.py:
+        (iOSEmbeddedBuildFactory): Skip building and uploading product archive.
+
+2020-07-29  Jonathan Bedard  <[email protected]>
+
         [webkitcorepy] Add an auto-installer
         https://bugs.webkit.org/show_bug.cgi?id=214606
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to