Diff
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png 2019-06-17 15:33:14 UTC (rev 246497)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.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/[email protected]
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2019-06-17 15:33:14 UTC (rev 246497)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png 2019-06-17 15:33:14 UTC (rev 246497)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.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/[email protected]
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2019-06-17 15:33:14 UTC (rev 246497)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png 2019-06-17 15:33:14 UTC (rev 246497)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.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/[email protected]
(Binary files differ)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected] 2019-06-17 15:33:14 UTC (rev 246497)
Property changes on: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]
___________________________________________________________________
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 (246496 => 246497)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2019-06-17 15:33:14 UTC (rev 246497)
@@ -25,8 +25,9 @@
Dashboard = {
Platform: {
- macOSMojave: { name: "macos-mojave", readableName: "macOS Mojave", order: 1 },
- macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 2 },
+ macOSCatalina: { name: "macos-catalina", readableName: "macOS Catalina", order: 1 },
+ macOSMojave: { name: "macos-mojave", readableName: "macOS Mojave", order: 2 },
+ macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 3 },
iOS12Simulator: { name: "ios-simulator-12", readableName: "iOS 12 Simulator", order: 20 },
iOS12Device: { name: "ios-12", readableName: "iOS 12", order: 25 },
Windows10: { name: "windows-10", readableName: "Windows 10", order: 30 },
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css (246496 => 246497)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css 2019-06-17 15:33:14 UTC (rev 246497)
@@ -205,6 +205,16 @@
content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS12.png) 1x);
}
+table.queue-grid tr.platform.ios-simulator-13 img.logo {
+ background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+ content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS13Simulator.png) 1x);
+}
+
+table.queue-grid tr.platform.ios-13 img.logo {
+ background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
+ content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS13.png) 1x);
+}
+
table.queue-grid tr.platform.macos-highsierra img.logo {
content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/HighSierra.png) 1x);
}
@@ -213,6 +223,10 @@
content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/Mojave.png) 1x);
}
+table.queue-grid tr.platform.macos-catalina img.logo {
+ content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/Catalina.png) 1x);
+}
+
table.queue-grid tr.platform.wincairo-windows-10 img.logo {
content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/Windows10.png) 1x);
}
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (246496 => 246497)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-06-17 15:33:14 UTC (rev 246497)
@@ -1086,6 +1086,7 @@
return 'Unknown'
build_to_name_mapping = {
+ '10.15': 'Catalina',
'10.14': 'Mojave',
'10.13': 'High Sierra',
'10.12': 'Sierra',
Modified: trunk/Tools/ChangeLog (246496 => 246497)
--- trunk/Tools/ChangeLog 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/ChangeLog 2019-06-17 15:33:14 UTC (rev 246497)
@@ -1,3 +1,24 @@
+2019-06-17 Jonathan Bedard <[email protected]>
+
+ webkitpy: Add macOS Catalina, iOS 13
+ https://bugs.webkit.org/show_bug.cgi?id=198492
+
+ Reviewed by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/[email protected]: Added.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
+ * BuildSlaveSupport/ews-build/steps.py:
+ * Scripts/webkitpy/common/version_name_map.py:
+ * Scripts/webkitpy/common/version_name_map_unittest.py:
+ * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+ * TestResultServer/static-dashboards/flakiness_dashboard.js:
+
2019-06-17 Carlos Garcia Campos <[email protected]>
Unreviewed. [GTK] Bump WPEBackend-fdo requirement to 1.3.1
Modified: trunk/Tools/Scripts/webkitpy/common/version_name_map.py (246496 => 246497)
--- trunk/Tools/Scripts/webkitpy/common/version_name_map.py 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/Scripts/webkitpy/common/version_name_map.py 2019-06-17 15:33:14 UTC (rev 246497)
@@ -60,10 +60,11 @@
'Sierra': Version(10, 12),
'High Sierra': Version(10, 13),
'Mojave': Version(10, 14),
+ 'Catalina': Version(10, 15),
},
- 'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(12)),
- 'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(12)),
- 'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(5)),
+ 'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(13)),
+ 'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(13)),
+ 'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(6)),
'win': {
'Win10': Version(10),
'8.1': Version(6, 3),
Modified: trunk/Tools/Scripts/webkitpy/common/version_name_map_unittest.py (246496 => 246497)
--- trunk/Tools/Scripts/webkitpy/common/version_name_map_unittest.py 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/Scripts/webkitpy/common/version_name_map_unittest.py 2019-06-17 15:33:14 UTC (rev 246497)
@@ -36,6 +36,8 @@
def test_mac_version_by_name(self):
map = VersionNameMap()
+ self.assertEqual(('mac', Version(10, 15)), map.from_name('Catalina'))
+ self.assertEqual(('mac', Version(10, 15)), map.from_name('catalina'))
self.assertEqual(('mac', Version(10, 14)), map.from_name('Mojave'))
self.assertEqual(('mac', Version(10, 14)), map.from_name('mojave'))
self.assertEqual(('mac', Version(10, 13)), map.from_name('High Sierra'))
@@ -57,6 +59,7 @@
def test_mac_name_by_version(self):
map = VersionNameMap()
+ self.assertEqual('Catalina', map.to_name(version=Version(10, 15), platform='mac'))
self.assertEqual('Mojave', map.to_name(version=Version(10, 14), platform='mac'))
self.assertEqual('High Sierra', map.to_name(version=Version(10, 13), platform='mac'))
self.assertEqual('High Sierra', map.to_name(version=Version(10, 13, 3), platform='mac'))
@@ -66,6 +69,7 @@
def test_ios_name_by_version(self):
map = VersionNameMap()
+ self.assertEqual('iOS 13', map.to_name(version=Version(13), platform='ios'))
self.assertEqual('iOS 12', map.to_name(version=Version(12), platform='ios'))
self.assertEqual('iOS 11', map.to_name(version=Version(11), platform='ios'))
self.assertEqual('iOS 10', map.to_name(version=Version(10), platform='ios'))
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (246496 => 246497)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2019-06-17 15:33:14 UTC (rev 246497)
@@ -226,7 +226,7 @@
# FIXME: Update the original modifiers and remove this once the old syntax is gone.
_configuration_tokens_list = [
'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite', 'ElCapitan', # Legacy macOS
- 'Mac', 'Sierra', 'HighSierra', 'Mojave',
+ 'Mac', 'Sierra', 'HighSierra', 'Mojave', 'Catalina',
'Win', 'XP', 'Vista', 'Win7',
'Linux',
'Android',
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (246496 => 246497)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2019-06-17 15:01:09 UTC (rev 246496)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2019-06-17 15:33:14 UTC (rev 246497)
@@ -61,6 +61,12 @@
'WK2': { fallbackPlatforms: ['APPLE_MAC_MOJAVE', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
}
},
+ 'CATALINA': {
+ subPlatforms: {
+ 'WK1': { fallbackPlatforms: ['APPLE_MAC_CATALINA', 'APPLE_MAC'] },
+ 'WK2': { fallbackPlatforms: ['APPLE_MAC_CATALINA', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
+ }
+ },
}
},
'WIN': {
@@ -359,6 +365,8 @@
if (string.contains(builderNameUpperCase, 'WINCAIRO'))
return 'WINCAIRO';
+ if (string.contains(builderNameUpperCase, 'CATALINA'))
+ return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_CATALINA');
if (string.contains(builderNameUpperCase, 'MOJAVE'))
return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_MOJAVE');
if (string.contains(builderNameUpperCase, 'HIGHSIERRA'))
@@ -712,6 +720,7 @@
'Sierra': 'SIERRA',
'HighSierra': 'HIGHSIERRA',
'Mojave': 'MOJAVE',
+ 'Catalina': 'CATALINA',
'Win7': 'WIN7',
'Win10': 'WIN10',
'XP': 'XP',
