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

Changeset 263291 in webkit


Ignore:
Timestamp:
Jun 19, 2020, 3:22:19 PM (6 years ago)
Author:
Jonathan Bedard
Message:

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

Legend:

Unmodified
Added
Removed

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

    r262998 r263291  
    5151                    { "name": "bot664", "platform": "ios-simulator-13"},
    5252
     53                    { "name": "bot607", "platform": "tvos-13" },
     54                    { "name": "bot608", "platform": "tvos-simulator-13" },
     55                    { "name": "bot609", "platform": "watchos-6" },
     56                    { "name": "bot672", "platform": "watchos-simulator-6" },
     57
    5358                    { "name": "bot545", "platform": "win" },
    5459                    { "name": "bot546", "platform": "win" },
    … …  
    235240                    },
    236241                    {
     242                      "name": "Apple-tvOS-13-Release-Build", "type": "Build", "builddir": "tvos-13-release",
     243                      "platform": "tvos-13", "configuration": "release", "architectures": ["arm64"],
     244                      "slavenames": ["bot607"]
     245                    },
     246                    {
     247                      "name": "Apple-tvOS-Simulator-13-Release-Build", "type": "Build", "builddir": "tvos-simulator-13-release",
     248                      "platform": "tvos-simulator-13", "configuration": "release", "architectures": ["x86_64"],
     249                      "slavenames": ["bot608"]
     250                    },
     251                    {
     252                      "name": "Apple-watchOS-6-Release-Build", "type": "Build", "builddir": "watchos-13-release",
     253                      "platform": "watchos-6", "configuration": "release", "architectures": ["arm64"],
     254                      "slavenames": ["bot609"]
     255                    },
     256                    {
     257                      "name": "Apple-watchOS-Simulator-6-Release-Build", "type": "Build", "builddir": "watchos-simulator-13-release",
     258                      "platform": "watchos-simulator-6", "configuration": "release", "architectures": ["i386"],
     259                      "slavenames": ["bot672"]
     260                    },
     261                    {
    237262                      "name": "Apple Win 10 Release (Build)", "type": "Build", "builddir": "win10-release",
    238263                      "platform": "win", "configuration": "release", "architectures": ["x86_64"],
    … …  
    485510                      "builderNames": ["Apple iOS 13 Simulator Release (Build)", "Apple iOS 13 Simulator Debug (Build)"]
    486511                    },
     512                    { "type": "PlatformSpecificScheduler", "platform": "tvos-13", "branch": "trunk", "treeStableTimer": 45.0,
     513                      "builderNames": ["Apple-tvOS-13-Release-Build"]
     514                    },
     515                    { "type": "PlatformSpecificScheduler", "platform": "tvos-simulator-13", "branch": "trunk", "treeStableTimer": 45.0,
     516                      "builderNames": ["Apple-tvOS-Simulator-13-Release-Build"]
     517                    },
     518                    { "type": "PlatformSpecificScheduler", "platform": "watchos-6", "branch": "trunk", "treeStableTimer": 45.0,
     519                      "builderNames": ["Apple-watchOS-6-Release-Build"]
     520                    },
     521                    { "type": "PlatformSpecificScheduler", "platform": "watchos-simulator-6", "branch": "trunk", "treeStableTimer": 45.0,
     522                      "builderNames": ["Apple-watchOS-Simulator-6-Release-Build"]
     523                    },
    487524                    { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
    488525                      "builderNames": ["Apple Win 10 Release (Build)", "Apple Win 10 Debug (Build)"]

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py

    r262975 r263291  
    6060            self.addStep(ArchiveBuiltProduct())
    6161            self.addStep(UploadBuiltProduct())
    62             if platform.startswith('mac') or platform.startswith('ios-simulator'):
     62            if platform.startswith('mac') or platform.startswith('ios-simulator') or platform.startswith('tvos-simulator') or platform.startswith('watchos-simulator'):
    6363                self.addStep(ArchiveMinifiedBuiltProduct())
    6464                self.addStep(UploadMinifiedBuiltProduct())

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

    r255082 r263291  
    3131        iOS13Simulator: { name: "ios-simulator-13", readableName: "iOS 13 Simulator", order: 20 },
    3232        iOS13Device: { name: "ios-13", readableName: "iOS 13", order: 25 },
     33        tvOS13Simulator: { name: "tvos-simulator-13", readableName: "TvOS Simulator 13", order: 26 },
     34        tvOS13Device: { name: "tvos-13", readableName: "TvOS 13", order: 27 },
     35        watchOS6Simulator: { name: "watchos-simulator-6", readableName: "WatchOS Simulator 6", order: 28 },
     36        watchOS6Device: { name: "watchos-6", readableName: "WatchOS 6", order: 29 },
    3337        Windows10: { name: "windows-10", readableName: "Windows 10", order: 30 },
    3438        WinCairo: { name: "wincairo-windows-10", readableName: "WinCairo", order: 50 },

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

    r257889 r263291  
    5454        "Apple iPadOS 13 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS13Simulator, heading:"iPadOS Release", debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
    5555        "Apple iPadOS 13 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS13Simulator, heading:"iPadOS Debug", debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
     56        "Apple-tvOS-13-Release-Build": {platform: Dashboard.Platform.tvOS13Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
     57        "Apple-tvOS-Simulator-13-Release-Build": {platform: Dashboard.Platform.tvOS13Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
     58        "Apple-watchOS-6-Release-Build": {platform: Dashboard.Platform.watchOS6Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
     59        "Apple-watchOS-Simulator-6-Release-Build": {platform: Dashboard.Platform.watchOS6Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
    5660        "Apple Win 10 Debug (Build)": {platform: Dashboard.Platform.Windows10, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit },
    5761        "Apple Win 10 Release (Build)": {platform: Dashboard.Platform.Windows10, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},

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

    r255082 r263291  
    202202}
    203203
     204table.queue-grid tr.platform.tvos-simulator-13 img.logo {
     205    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
     206    content: -webkit-image-set(url(../Images/TvOS13Simulator@2x.png) 2x, url(../Images/TvOS13Simulator.png) 1x);
     207}
     208
     209table.queue-grid tr.platform.tvos-13 img.logo {
     210    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
     211    content: -webkit-image-set(url(../Images/TvOS13@2x.png) 2x, url(../Images/TvOS13.png) 1x);
     212}
     213
     214table.queue-grid tr.platform.watchos-simulator-6 img.logo {
     215    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
     216    content: -webkit-image-set(url(../Images/WatchOSSimulator6@2x.png) 2x, url(../Images/WatchOSSimulator6.png) 1x);
     217}
     218
     219table.queue-grid tr.platform.watchos-6 img.logo {
     220    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
     221    content: -webkit-image-set(url(../Images/WatchOS6@2x.png) 2x, url(../Images/WatchOS6.png) 1x);
     222}
     223
    204224table.queue-grid tr.platform.macos-mojave img.logo {
    205225    content: -webkit-image-set(url(../Images/Mojave@2x.png) 2x, url(../Images/Mojave.png) 1x);

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py

    r261871 r263291  
    206206
    207207def appendCustomBuildFlags(step, platform, fullPlatform):
    208     if platform not in ('gtk', 'wincairo', 'ios', 'jsc-only', 'wpe', 'playstation'):
     208    if platform not in ('gtk', 'wincairo', 'ios', 'jsc-only', 'wpe', 'playstation', 'tvos', 'watchos',):
    209209        return
    210     if fullPlatform.startswith('ios-simulator'):
    211         platform = 'ios-simulator'
    212     elif platform == 'ios':
    213         platform = 'device'
     210    if 'simulator' in fullPlatform:
     211        platform = platform + '-simulator'
     212    elif platform in ['ios', 'tvos', 'watchos']:
     213        platform = platform + '-device'
    214214    step.setCommand(step.command + ['--' + platform])
    215215
    … …  
    243243        if additionalArguments:
    244244            self.setCommand(self.command + additionalArguments)
    245         if platform in ('mac', 'ios') and architecture:
     245        if platform in ('mac', 'ios', 'tvos', 'watchos') and architecture:
    246246            self.setCommand(self.command + ['ARCHS=' + architecture])
    247             if platform == 'ios':
     247            if platform in ['ios', 'tvos', 'watchos']:
    248248                self.setCommand(self.command + ['ONLY_ACTIVE_ARCH=NO'])
    249         if platform in ('mac', 'ios') and buildOnly:
     249        if platform in ('mac', 'ios', 'tvos', 'watchos') and buildOnly:
    250250            # For build-only bots, the expectation is that tests will be run on separate machines,
    251251            # so we need to package debug info as dSYMs. Only generating line tables makes

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py

    r262975 r263291  
    559559    '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'],
    560560
     561    'Apple-tvOS-13-Release-Build': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
     562    'Apple-tvOS-Simulator-13-Release-Build': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
     563
     564    'Apple-watchOS-6-Release-Build': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
     565    'Apple-watchOS-Simulator-6-Release-Build': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
     566
    561567    'JSCOnly Linux ARMv7 Thumb2 Release': ['configure build', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
    562568    'JSCOnly Linux ARMv7 Thumb2 SoftFP Release': ['configure build', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],

  • trunk/Tools/ChangeLog

    r263290 r263291  
     12020-06-19  Jonathan Bedard  <jbedard@apple.com>
     2
     3        Bring up watchOS/tvOS on build.webkit.org
     4        https://bugs.webkit.org/show_bug.cgi?id=213402
     5        <rdar://problem/64542588>
     6
     7        Reviewed by Aakash Jain.
     8
     9        * BuildSlaveSupport/build.webkit.org-config/config.json: Add AppleTV and watchOS builders.
     10        * BuildSlaveSupport/build.webkit.org-config/factories.py:
     11        (BuildFactory.__init__): Support AppleTV and watchOS.
     12        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13.png: Added.
     13        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13@2x.png: Added.
     14        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13Simulator.png: Added.
     15        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/TvOS13Simulator@2x.png: Added.
     16        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOS6.png: Added.
     17        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOS6@2x.png: Added.
     18        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOSSimulator6.png: Added.
     19        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Images/WatchOSSimulator6@2x.png: Added.
     20        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
     21        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
     22        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
     23        * BuildSlaveSupport/build.webkit.org-config/steps.py:
     24        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
     25
    1262020-06-19  Saam Barati  <sbarati@apple.com>
    227
Note: See TracChangeset for help on using the changeset viewer.