Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (265081 => 265082)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2020-07-30 15:10:39 UTC (rev 265081)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2020-07-30 15:55:56 UTC (rev 265082)
@@ -43,7 +43,7 @@
# These queue names are from shortname in https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/ews-build/config.json
# FIXME: Auto-generate this list https://bugs.webkit.org/show_bug.cgi?id=195640
# Note: This list is sorted in the order of which bubbles appear in bugzilla.
- ALL_QUEUES = ['style', 'ios', 'ios-sim', 'mac', 'mac-debug', 'tv', 'tv-sim', 'watch', 'watch-sim', 'gtk', 'wpe', 'wincairo', 'win',
+ ALL_QUEUES = ['style', 'ios', 'ios-sim', 'mac', 'mac-debug', 'mac-AS', 'tv', 'tv-sim', 'watch', 'watch-sim', 'gtk', 'wpe', 'wincairo', 'win',
'ios-wk2', 'mac-wk1', 'mac-wk2', 'mac-debug-wk1', 'api-ios', 'api-mac', 'api-gtk',
'bindings', 'jsc', 'jsc-armv7', 'jsc-mips', 'jsc-i386', 'webkitperl', 'webkitpy', 'services']
# FIXME: Auto-generate the queue's trigger relationship
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (265081 => 265082)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2020-07-30 15:10:39 UTC (rev 265081)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2020-07-30 15:55:56 UTC (rev 265082)
@@ -194,6 +194,10 @@
"platform": "mac-mojave"
},
{
+ "name": "ews129",
+ "platform": "mac-bigsur"
+ },
+ {
"name": "ews150",
"platform": "*"
},
@@ -384,6 +388,16 @@
"workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
},
{
+ "name": "macOS-BigSur-Release-Build-EWS",
+ "shortname": "mac-AS",
+ "icon": "buildOnly",
+ "factory": "macOSBuildOnlyFactory",
+ "platform": "mac-bigsur",
+ "configuration": "release",
+ "architectures": ["arm64"],
+ "workernames": ["ews129"]
+ },
+ {
"name": "macOS-Mojave-Release-Build-EWS",
"shortname": "mac",
"icon": "buildOnly",
@@ -645,7 +659,7 @@
"port": 5555,
"builderNames": ["Apply-WatchList-EWS", "Bindings-Tests-EWS", "GTK-Build-EWS", "iOS-13-Build-EWS", "iOS-13-Simulator-Build-EWS",
"JSC-ARMv7-32bits-Build-EWS", "JSC-ARMv7-32bits-EWS", "JSC-i386-32bits-EWS", "JSC-MIPSEL-32bits-Build-EWS",
- "JSC-MIPSEL-32bits-EWS", "JSC-Tests-EWS", "macOS-Mojave-Debug-Build-EWS", "macOS-Mojave-Release-Build-EWS",
+ "JSC-MIPSEL-32bits-EWS", "JSC-Tests-EWS", "macOS-BigSur-Release-Build-EWS", "macOS-Mojave-Debug-Build-EWS", "macOS-Mojave-Release-Build-EWS",
"Services-EWS", "Style-EWS",
"tvOS-13-Build-EWS", "tvOS-13-Simulator-Build-EWS", "watchOS-6-Build-EWS", "watchOS-6-Simulator-Build-EWS",
"WPE-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS", "WinCairo-EWS", "Windows-EWS"]
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (265081 => 265082)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2020-07-30 15:10:39 UTC (rev 265081)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2020-07-30 15:55:56 UTC (rev 265082)
@@ -169,6 +169,10 @@
pass
+class macOSBuildOnlyFactory(BuildFactory):
+ skipUpload = True
+
+
class watchOSBuildFactory(BuildFactory):
skipUpload = True
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py (265081 => 265082)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py 2020-07-30 15:10:39 UTC (rev 265081)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories_unittest.py 2020-07-30 15:55:56 UTC (rev 265082)
@@ -170,6 +170,19 @@
_BuildStepFactory(steps.CompileWebKit, skipUpload=False),
])
+ def test_macos_build_only_factory(self):
+ factory = factories.macOSBuildOnlyFactory(platform='mac-bigsur', configuration='release', architectures=["arm64"])
+ self.assertBuildSteps(factory.steps, [
+ _BuildStepFactory(steps.ConfigureBuild, platform='mac-bigsur', 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_ios_build_factory(self):
factory = factories.iOSBuildFactory(platform='ios-simulator-13', configuration='release', architectures=["x86_64"])
self.assertBuildSteps(factory.steps, [
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py (265081 => 265082)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2020-07-30 15:10:39 UTC (rev 265081)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2020-07-30 15:55:56 UTC (rev 265082)
@@ -33,7 +33,7 @@
from factories import (APITestsFactory, BindingsFactory, BuildFactory, CommitQueueFactory, Factory, GTKBuildFactory,
GTKTestsFactory, JSCBuildFactory, JSCBuildAndTestsFactory, StyleFactory, TestFactory, tvOSBuildFactory,
WPEFactory, WebKitPerlFactory, WebKitPyFactory, WinCairoFactory, WindowsFactory, iOSBuildFactory, iOSEmbeddedBuildFactory, iOSTestsFactory,
- macOSBuildFactory, macOSWK1Factory, macOSWK2Factory, ServicesFactory, WatchListFactory, watchOSBuildFactory)
+ macOSBuildFactory, macOSBuildOnlyFactory, macOSWK1Factory, macOSWK2Factory, ServicesFactory, WatchListFactory, watchOSBuildFactory)
BUILDER_NAME_LENGTH_LIMIT = 70
STEP_NAME_LENGTH_LIMIT = 50
Modified: trunk/Tools/ChangeLog (265081 => 265082)
--- trunk/Tools/ChangeLog 2020-07-30 15:10:39 UTC (rev 265081)
+++ trunk/Tools/ChangeLog 2020-07-30 15:55:56 UTC (rev 265082)
@@ -1,3 +1,20 @@
+2020-07-30 Jonathan Bedard <jbed...@apple.com>
+
+ [Big Sur] Add limited Seed 3 support to EWS
+ https://bugs.webkit.org/show_bug.cgi?id=214874
+ <rdar://problem/66216190>
+
+ Reviewed by Aakash Jain.
+
+ * BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+ (StatusBubble): Add AppleSilicon bubbles.
+ * BuildSlaveSupport/ews-build/config.json: Add AppleSilicon device.
+ * BuildSlaveSupport/ews-build/factories.py:
+ (macOSBuildOnlyFactory): Skip uploading to S3.
+ * BuildSlaveSupport/ews-build/factories_unittest.py:
+ (TestBuildFactory.test_macos_build_only_factory):
+ * BuildSlaveSupport/ews-build/loadConfig.py: Import macOSBuildOnlyFactory.
+
2020-07-30 Alex Christensen <achristen...@webkit.org>
Remove non-inclusive terminology from WebKit variable names and test-only SPI
