⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 246497 in webkit


Ignore:
Timestamp:
Jun 17, 2019, 8:33:14 AM (7 years ago)
Author:
Jonathan Bedard
Message:

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/​Catalina@2x.png: Added.
  • BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png: Added.
  • BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/​IOS13@2x.png: Added.
  • BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png: Added.
  • BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/​IOS13Simulator@2x.png: 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:
Location:
trunk/Tools
Files:
6 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js

    r239859 r246497  
    2626Dashboard = {
    2727    Platform: {
    28         macOSMojave: { name: "macos-mojave", readableName: "macOS Mojave", order: 1 },
    29         macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 2 },
     28        macOSCatalina: { name: "macos-catalina", readableName: "macOS Catalina", order: 1 },
     29        macOSMojave: { name: "macos-mojave", readableName: "macOS Mojave", order: 2 },
     30        macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 3 },
    3031        iOS12Simulator: { name: "ios-simulator-12", readableName: "iOS 12 Simulator", order: 20 },
    3132        iOS12Device: { name: "ios-12", readableName: "iOS 12", order: 25 },

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css

    r239859 r246497  
    206206}
    207207
     208table.queue-grid tr.platform.ios-simulator-13 img.logo {
     209    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
     210    content: -webkit-image-set(url(../Images/IOS13Simulator@2x.png) 2x, url(../Images/IOS13Simulator.png) 1x);
     211}
     212
     213table.queue-grid tr.platform.ios-13 img.logo {
     214    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
     215    content: -webkit-image-set(url(../Images/IOS13@2x.png) 2x, url(../Images/IOS13.png) 1x);
     216}
     217
    208218table.queue-grid tr.platform.macos-highsierra img.logo {
    209219    content: -webkit-image-set(url(../Images/HighSierra@2x.png) 2x, url(../Images/HighSierra.png) 1x);
    … …  
    212222table.queue-grid tr.platform.macos-mojave img.logo {
    213223    content: -webkit-image-set(url(../Images/Mojave@2x.png) 2x, url(../Images/Mojave.png) 1x);
     224}
     225
     226table.queue-grid tr.platform.macos-catalina img.logo {
     227    content: -webkit-image-set(url(../Images/Catalina@2x.png) 2x, url(../Images/Catalina.png) 1x);
    214228}
    215229

  • trunk/Tools/BuildSlaveSupport/ews-build/steps.py

    r246080 r246497  
    10871087
    10881088        build_to_name_mapping = {
     1089            '10.15': 'Catalina',
    10891090            '10.14': 'Mojave',
    10901091            '10.13': 'High Sierra',

  • trunk/Tools/ChangeLog

    r246493 r246497  
     12019-06-17  Jonathan Bedard  <jbedard@apple.com>
     2
     3        webkitpy: Add macOS Catalina, iOS 13
     4        https://bugs.webkit.org/show_bug.cgi?id=198492
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina.png: Added.
     9        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/Catalina@2x.png: Added.
     10        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13.png: Added.
     11        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13@2x.png: Added.
     12        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator.png: Added.
     13        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/IOS13Simulator@2x.png: Added.
     14        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
     15        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
     16        * BuildSlaveSupport/ews-build/steps.py:
     17        * Scripts/webkitpy/common/version_name_map.py:
     18        * Scripts/webkitpy/common/version_name_map_unittest.py:
     19        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
     20        * TestResultServer/static-dashboards/flakiness_dashboard.js:
     21
    1222019-06-17  Carlos Garcia Campos  <cgarcia@igalia.com>
    223

  • trunk/Tools/Scripts/webkitpy/common/version_name_map.py

    r232877 r246497  
    6161                'High Sierra': Version(10, 13),
    6262                'Mojave': Version(10, 14),
     63                'Catalina': Version(10, 15),
    6364            },
    64             'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(12)),
    65             'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(12)),
    66             'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(5)),
     65            'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(13)),
     66            'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(13)),
     67            'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(6)),
    6768            'win': {
    6869                'Win10': Version(10),

  • trunk/Tools/Scripts/webkitpy/common/version_name_map_unittest.py

    r232877 r246497  
    3737    def test_mac_version_by_name(self):
    3838        map = VersionNameMap()
     39        self.assertEqual(('mac', Version(10, 15)), map.from_name('Catalina'))
     40        self.assertEqual(('mac', Version(10, 15)), map.from_name('catalina'))
    3941        self.assertEqual(('mac', Version(10, 14)), map.from_name('Mojave'))
    4042        self.assertEqual(('mac', Version(10, 14)), map.from_name('mojave'))
    … …  
    5860    def test_mac_name_by_version(self):
    5961        map = VersionNameMap()
     62        self.assertEqual('Catalina', map.to_name(version=Version(10, 15), platform='mac'))
    6063        self.assertEqual('Mojave', map.to_name(version=Version(10, 14), platform='mac'))
    6164        self.assertEqual('High Sierra', map.to_name(version=Version(10, 13), platform='mac'))
    … …  
    6770    def test_ios_name_by_version(self):
    6871        map = VersionNameMap()
     72        self.assertEqual('iOS 13', map.to_name(version=Version(13), platform='ios'))
    6973        self.assertEqual('iOS 12', map.to_name(version=Version(12), platform='ios'))
    7074        self.assertEqual('iOS 11', map.to_name(version=Version(11), platform='ios'))

  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

    r241329 r246497  
    227227    _configuration_tokens_list = [
    228228        'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite', 'ElCapitan', # Legacy macOS
    229         'Mac', 'Sierra', 'HighSierra', 'Mojave',
     229        'Mac', 'Sierra', 'HighSierra', 'Mojave', 'Catalina',
    230230        'Win', 'XP', 'Vista', 'Win7',
    231231        'Linux',

  • trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js

    r245541 r246497  
    6262                        }
    6363                    },
     64                    'CATALINA': {
     65                        subPlatforms: {
     66                            'WK1': { fallbackPlatforms: ['APPLE_MAC_CATALINA', 'APPLE_MAC'] },
     67                            'WK2': { fallbackPlatforms: ['APPLE_MAC_CATALINA', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
     68                        }
     69                    },
    6470                }
    6571            },
    … …  
    360366        return 'WINCAIRO';
    361367
     368    if (string.contains(builderNameUpperCase, 'CATALINA'))
     369        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_CATALINA');
    362370    if (string.contains(builderNameUpperCase, 'MOJAVE'))
    363371        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_MOJAVE');
    … …  
    713721            'HighSierra': 'HIGHSIERRA',
    714722            'Mojave': 'MOJAVE',
     723            'Catalina': 'CATALINA',
    715724            'Win7': 'WIN7',
    716725            'Win10': 'WIN10',
Note: See TracChangeset for help on using the changeset viewer.