Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (263290 => 263291)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2020-06-19 22:22:19 UTC (rev 263291)
@@ -50,6 +50,11 @@
{ "name": "bot667", "platform": "ios-simulator-13"},
{ "name": "bot664", "platform": "ios-simulator-13"},
+ { "name": "bot607", "platform": "tvos-13" },
+ { "name": "bot608", "platform": "tvos-simulator-13" },
+ { "name": "bot609", "platform": "watchos-6" },
+ { "name": "bot672", "platform": "watchos-simulator-6" },
+
{ "name": "bot545", "platform": "win" },
{ "name": "bot546", "platform": "win" },
{ "name": "bot547", "platform": "win" },
@@ -234,6 +239,26 @@
"slavenames": ["bot664"]
},
{
+ "name": "Apple-tvOS-13-Release-Build", "type": "Build", "builddir": "tvos-13-release",
+ "platform": "tvos-13", "configuration": "release", "architectures": ["arm64"],
+ "slavenames": ["bot607"]
+ },
+ {
+ "name": "Apple-tvOS-Simulator-13-Release-Build", "type": "Build", "builddir": "tvos-simulator-13-release",
+ "platform": "tvos-simulator-13", "configuration": "release", "architectures": ["x86_64"],
+ "slavenames": ["bot608"]
+ },
+ {
+ "name": "Apple-watchOS-6-Release-Build", "type": "Build", "builddir": "watchos-13-release",
+ "platform": "watchos-6", "configuration": "release", "architectures": ["arm64"],
+ "slavenames": ["bot609"]
+ },
+ {
+ "name": "Apple-watchOS-Simulator-6-Release-Build", "type": "Build", "builddir": "watchos-simulator-13-release",
+ "platform": "watchos-simulator-6", "configuration": "release", "architectures": ["i386"],
+ "slavenames": ["bot672"]
+ },
+ {
"name": "Apple Win 10 Release (Build)", "type": "Build", "builddir": "win10-release",
"platform": "win", "configuration": "release", "architectures": ["x86_64"],
"triggers": ["win10-release-tests"],
@@ -484,6 +509,18 @@
{ "type": "PlatformSpecificScheduler", "platform": "ios-simulator-13", "branch": "trunk", "treeStableTimer": 45.0,
"builderNames": ["Apple iOS 13 Simulator Release (Build)", "Apple iOS 13 Simulator Debug (Build)"]
},
+ { "type": "PlatformSpecificScheduler", "platform": "tvos-13", "branch": "trunk", "treeStableTimer": 45.0,
+ "builderNames": ["Apple-tvOS-13-Release-Build"]
+ },
+ { "type": "PlatformSpecificScheduler", "platform": "tvos-simulator-13", "branch": "trunk", "treeStableTimer": 45.0,
+ "builderNames": ["Apple-tvOS-Simulator-13-Release-Build"]
+ },
+ { "type": "PlatformSpecificScheduler", "platform": "watchos-6", "branch": "trunk", "treeStableTimer": 45.0,
+ "builderNames": ["Apple-watchOS-6-Release-Build"]
+ },
+ { "type": "PlatformSpecificScheduler", "platform": "watchos-simulator-6", "branch": "trunk", "treeStableTimer": 45.0,
+ "builderNames": ["Apple-watchOS-Simulator-6-Release-Build"]
+ },
{ "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
"builderNames": ["Apple Win 10 Release (Build)", "Apple Win 10 Debug (Build)"]
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py (263290 => 263291)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py 2020-06-19 22:22:19 UTC (rev 263291)
@@ -59,7 +59,7 @@
if triggers:
self.addStep(ArchiveBuiltProduct())
self.addStep(UploadBuiltProduct())
- if platform.startswith('mac') or platform.startswith('ios-simulator'):
+ if platform.startswith('mac') or platform.startswith('ios-simulator') or platform.startswith('tvos-simulator') or platform.startswith('watchos-simulator'):
self.addStep(ArchiveMinifiedBuiltProduct())
self.addStep(UploadMinifiedBuiltProduct())
if self.ShouldRunJSCBundleStep:
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13.png 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13.png 2020-06-19 22:22:19 UTC (rev 263291)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvo...@2x.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvo...@2x.png 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvo...@2x.png 2020-06-19 22:22:19 UTC (rev 263291)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvo...@2x.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13Simulator.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13Simulator.png 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13Simulator.png 2020-06-19 22:22:19 UTC (rev 263291)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13Simulator.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvos13simula...@2x.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvos13simula...@2x.png 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvos13simula...@2x.png 2020-06-19 22:22:19 UTC (rev 263291)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvos13simula...@2x.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOS6.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOS6.png 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOS6.png 2020-06-19 22:22:19 UTC (rev 263291)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOS6.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watch...@2x.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watch...@2x.png 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watch...@2x.png 2020-06-19 22:22:19 UTC (rev 263291)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watch...@2x.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOSSimulator6.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOSSimulator6.png 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOSSimulator6.png 2020-06-19 22:22:19 UTC (rev 263291)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOSSimulator6.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watchossimulat...@2x.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watchossimulat...@2x.png 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watchossimulat...@2x.png 2020-06-19 22:22:19 UTC (rev 263291)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watchossimulat...@2x.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (263290 => 263291)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2020-06-19 22:22:19 UTC (rev 263291)
@@ -30,6 +30,10 @@
macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 3 },
iOS13Simulator: { name: "ios-simulator-13", readableName: "iOS 13 Simulator", order: 20 },
iOS13Device: { name: "ios-13", readableName: "iOS 13", order: 25 },
+ tvOS13Simulator: { name: "tvos-simulator-13", readableName: "TvOS Simulator 13", order: 26 },
+ tvOS13Device: { name: "tvos-13", readableName: "TvOS 13", order: 27 },
+ watchOS6Simulator: { name: "watchos-simulator-6", readableName: "WatchOS Simulator 6", order: 28 },
+ watchOS6Device: { name: "watchos-6", readableName: "WatchOS 6", order: 29 },
Windows10: { name: "windows-10", readableName: "Windows 10", order: 30 },
WinCairo: { name: "wincairo-windows-10", readableName: "WinCairo", order: 50 },
LinuxWPE: { name : "linux-wpe", readableName: "Linux WPE", order: 90 },
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (263290 => 263291)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2020-06-19 22:22:19 UTC (rev 263291)
@@ -53,6 +53,10 @@
"Apple iOS 13 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS13Simulator, debug: true, heading:"iOS Debug", tester: true, testCategory: Buildbot.TestCategory.WebKit2},
"Apple iPadOS 13 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS13Simulator, heading:"iPadOS Release", debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
"Apple iPadOS 13 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS13Simulator, heading:"iPadOS Debug", debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+ "Apple-tvOS-13-Release-Build": {platform: Dashboard.Platform.tvOS13Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+ "Apple-tvOS-Simulator-13-Release-Build": {platform: Dashboard.Platform.tvOS13Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+ "Apple-watchOS-6-Release-Build": {platform: Dashboard.Platform.watchOS6Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+ "Apple-watchOS-Simulator-6-Release-Build": {platform: Dashboard.Platform.watchOS6Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
"Apple Win 10 Debug (Build)": {platform: Dashboard.Platform.Windows10, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit },
"Apple Win 10 Release (Build)": {platform: Dashboard.Platform.Windows10, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
"Apple Win 10 Debug (Tests)": {platform: Dashboard.Platform.Windows10, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css (263290 => 263291)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css 2020-06-19 22:22:19 UTC (rev 263291)
@@ -201,6 +201,26 @@
content: -webkit-image-set(url(../Images/io...@2x.png) 2x, url(../Images/IOS13.png) 1x);
}
+table.queue-grid tr.platform.tvos-simulator-13 img.logo {
+ background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+ content: -webkit-image-set(url(../Images/tvos13simula...@2x.png) 2x, url(../Images/TvOS13Simulator.png) 1x);
+}
+
+table.queue-grid tr.platform.tvos-13 img.logo {
+ background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+ content: -webkit-image-set(url(../Images/tvo...@2x.png) 2x, url(../Images/TvOS13.png) 1x);
+}
+
+table.queue-grid tr.platform.watchos-simulator-6 img.logo {
+ background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+ content: -webkit-image-set(url(../Images/watchossimulat...@2x.png) 2x, url(../Images/WatchOSSimulator6.png) 1x);
+}
+
+table.queue-grid tr.platform.watchos-6 img.logo {
+ background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+ content: -webkit-image-set(url(../Images/watch...@2x.png) 2x, url(../Images/WatchOS6.png) 1x);
+}
+
table.queue-grid tr.platform.macos-mojave img.logo {
content: -webkit-image-set(url(../Images/moj...@2x.png) 2x, url(../Images/Mojave.png) 1x);
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (263290 => 263291)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2020-06-19 22:22:19 UTC (rev 263291)
@@ -205,12 +205,12 @@
def appendCustomBuildFlags(step, platform, fullPlatform):
- if platform not in ('gtk', 'wincairo', 'ios', 'jsc-only', 'wpe', 'playstation'):
+ if platform not in ('gtk', 'wincairo', 'ios', 'jsc-only', 'wpe', 'playstation', 'tvos', 'watchos',):
return
- if fullPlatform.startswith('ios-simulator'):
- platform = 'ios-simulator'
- elif platform == 'ios':
- platform = 'device'
+ if 'simulator' in fullPlatform:
+ platform = platform + '-simulator'
+ elif platform in ['ios', 'tvos', 'watchos']:
+ platform = platform + '-device'
step.setCommand(step.command + ['--' + platform])
@@ -242,11 +242,11 @@
if additionalArguments:
self.setCommand(self.command + additionalArguments)
- if platform in ('mac', 'ios') and architecture:
+ if platform in ('mac', 'ios', 'tvos', 'watchos') and architecture:
self.setCommand(self.command + ['ARCHS=' + architecture])
- if platform == 'ios':
+ if platform in ['ios', 'tvos', 'watchos']:
self.setCommand(self.command + ['_ONLY_ACTIVE_ARCH_=NO'])
- if platform in ('mac', 'ios') and buildOnly:
+ if platform in ('mac', 'ios', 'tvos', 'watchos') and buildOnly:
# For build-only bots, the expectation is that tests will be run on separate machines,
# so we need to package debug info as dSYMs. Only generating line tables makes
# this much faster than full debug info, and crash logs still have line numbers.
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (263290 => 263291)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-06-19 22:22:19 UTC (rev 263291)
@@ -558,6 +558,12 @@
'Apple iPadOS 13 Simulator Release WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'wait-for-crash-collection', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'trigger-crash-log-submission', 'archive-test-results', 'upload', 'MasterShellCommand'],
'Apple iPadOS 13 Simulator Debug WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'wait-for-crash-collection', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'trigger-crash-log-submission', 'archive-test-results', 'upload', 'MasterShellCommand'],
+ 'Apple-tvOS-13-Release-Build': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
+ 'Apple-tvOS-Simulator-13-Release-Build': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
+
+ 'Apple-watchOS-6-Release-Build': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
+ 'Apple-watchOS-Simulator-6-Release-Build': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
+
'JSCOnly Linux ARMv7 Thumb2 Release': ['configure build', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
'JSCOnly Linux ARMv7 Thumb2 SoftFP Release': ['configure build', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
'JSCOnly Linux AArch64 Release': ['configure build', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
Modified: trunk/Tools/ChangeLog (263290 => 263291)
--- trunk/Tools/ChangeLog 2020-06-19 22:13:47 UTC (rev 263290)
+++ trunk/Tools/ChangeLog 2020-06-19 22:22:19 UTC (rev 263291)
@@ -1,3 +1,28 @@
+2020-06-19 Jonathan Bedard <jbed...@apple.com>
+
+ Bring up watchOS/tvOS on build.webkit.org
+ https://bugs.webkit.org/show_bug.cgi?id=213402
+ <rdar://problem/64542588>
+
+ Reviewed by Aakash Jain.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json: Add AppleTV and watchOS builders.
+ * BuildSlaveSupport/build.webkit.org-config/factories.py:
+ (BuildFactory.__init__): Support AppleTV and watchOS.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvo...@2x.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13Simulator.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/tvos13simula...@2x.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOS6.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watch...@2x.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOSSimulator6.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/watchossimulat...@2x.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
+ * BuildSlaveSupport/build.webkit.org-config/steps.py:
+ * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
+
2020-06-19 Saam Barati <sbar...@apple.com>
Have a memory monitor thread in jsc shell when running tests using --memory-limited
