Changeset 267712 in webkit

Timestamp:

Sep 28, 2020, 1:06:52 PM (6 years ago)

Author:

Matt Lewis

Message:

Fix Build triggers for iOS, watchOS, and tvOS
​https://bugs.webkit.org/show_bug.cgi?id=217057

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
• BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:

(ShouldBuildTest):
(ShouldBuildTest.test_should_build):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/wkbuild.py (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py

@@ -47 +47 @@
         "mac-bigsur",
         "win",
-        "ios-13",
-        "ios-simulator-13",
-        "tvos-13",
-        "tvos-simulator-13",
-        "watchos-6",
-        "watchos-simulator-6",
+        "ios-14",
+        "ios-simulator-14",
+        "tvos-14",
+        "tvos-simulator-14",
+        "watchos-7",
+        "watchos-simulator-7",
     ))
 

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py

@@ -30 +30 @@
         (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
         (["Websites/bugs.webkit.org/foo"], []),
-        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
-        (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
+        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
+        (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
         (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit/win/WebKit2.vcproj", "Source/WebKitLegacy/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
         (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
@@ -42 +42 @@
         (["LayoutTests/platform/mac-mojave/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
         (["LayoutTests/platform/mac-catalina/foo"], ["mac-mojave", "mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
-        (["LayoutTests/platform/ios-simulator/foo"], ["ios-13", "ios-simulator-13"]),
-        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-13", "ios-simulator-13"]),
-        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-13", "ios-simulator-13"]),
-        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13"]),
+        (["LayoutTests/platform/ios-simulator/foo"], ["ios-14", "ios-simulator-14"]),
+        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-14", "ios-simulator-14"]),
+        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-14", "ios-simulator-14"]),
+        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-14", "ios-simulator-14"]),
         (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
         (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
@@ -53 +53 @@
         (["LayoutTests/platform/win-wk1/foo"], ["win"]),
         (["LayoutTests/platform/win/foo"], ["win"]),
-        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
-        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
+        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
+        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
         (["Source/WebKitLegacy/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
-        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
-        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
-        (["Source/WebCore/ios/foo"], ["ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
+        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
+        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
+        (["Source/WebCore/ios/foo"], ["ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
         (["Source/WebCore/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
         (["Source/WebCore/win/foo"], ["win"]),
-        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
+        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
-        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
+        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
         (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
-        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]),
+        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
     ]
@@ -73 +73 @@
             # FIXME: We should test more platforms here once
             # wkbuild._should_file_trigger_build is implemented for them.
-            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-13", "ios-simulator-13", "tvos-13", "tvos-simulator-13", "watchos-6", "watchos-simulator-6"]:
+            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]:
                 should_build = platform in platforms or "*" in platforms
                 self.assertEqual(wkbuild.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-28  Matt Lewis  <jlewis3@apple.com>
+
+        Fix Build triggers for iOS, watchOS, and tvOS
+        https://bugs.webkit.org/show_bug.cgi?id=217057
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
+        (ShouldBuildTest):
+        (ShouldBuildTest.test_should_build):
+
 2020-09-28  Jonathan Bedard  <jbedard@apple.com>