Fixing build scheduling for Catalina queues.
https://bugs.webkit.org/show_bug.cgi?id=202814
Reviewed by Aakash Jain.
* BuildSlaveSupport/build.webkit.org-config/config.json: Drive By fix of Trigger.
* BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
(_should_file_trigger_build):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250979 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
index 9266b75..1284ac4 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -436,7 +436,7 @@
"builderNames": ["Apple Catalina Debug WK1 (Tests)"]
},
{ "type": "Triggerable", "name": "catalina-debug-tests-wk2",
- "builderNames": ["Apple Mojave Debug WK2 (Tests)"]
+ "builderNames": ["Apple Catalina Debug WK2 (Tests)"]
},
{ "type": "Triggerable", "name": "catalina-leaks",
"builderNames": ["Apple Catalina (Leaks)"]
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py b/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py
index f5a6f14..861f0bc 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py
@@ -37,7 +37,7 @@
# and start using it for their bots. Someone familiar with each platform
# will have to figure out what the right set of directories/patterns is for
# that platform.
- assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-13", "ios-simulator-13"))
+ assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "mac-catalina", "win", "ios-13", "ios-simulator-13"))
directories = [
# Directories that shouldn't trigger builds on any bots.
@@ -60,6 +60,7 @@
("LayoutTests/platform/mac-sierra", ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
("LayoutTests/platform/mac-highsierra", ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
("LayoutTests/platform/mac-mojave", ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
+ ("LayoutTests/platform/mac-catalina", ["mac-mojave", "mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
("LayoutTests/platform/mac-wk2", ["mac"]),
("LayoutTests/platform/mac-wk1", ["mac"]),
("LayoutTests/platform/mac", ["mac", "win"]),
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0520c5d..daabe36 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-10 Matt Lewis <jlewis3@apple.com>
+
+ Fixing build scheduling for Catalina queues.
+ https://bugs.webkit.org/show_bug.cgi?id=202814
+
+ Reviewed by Aakash Jain.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json: Drive By fix of Trigger.
+ * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+ (_should_file_trigger_build):
+
2019-10-10 Sihui Liu <sihui_liu@apple.com>
Add a unit test for StorageQuotaManager
