Implement safe-merge-queue #17552

briannafan · 2023-09-07T21:04:13Z

`d3044ed`

Implement safe-merge-queue
https://bugs.webkit.org/show_bug.cgi?id=261288
rdar://114993838

Reviewed by Jonathan Bedard.

Adding the safe-merge-queue label adds the PR to a queue which is periodically checked through BuildBot.
If the PR passes EWS checks, merge-queue label is automatically added and the PR will be landed.
If the label is not added by a committer, or if the PR does not pass EWS checks, merging-blocked label is added.

* Tools/CISupport/ews-build/config.json:
* Tools/CISupport/ews-build/factories.py:
(UnsafeMergeQueueFactory.__init__):
(SafeMergeQueueFactory):
(SafeMergeQueueFactory.__init__):
* Tools/CISupport/ews-build/factories_unittest.py:
(TestExpectedBuildSteps):
* Tools/CISupport/ews-build/loadConfig.py:
* Tools/CISupport/ews-build/steps.py:
(GitHubMixin):
(GitHubMixin.get_number_of_prs_with_label):
(ValidateCommitterAndReviewer):
(ValidateCommitterAndReviewer.fail_build):
(ValidateCommitterAndReviewer.run):
(DetermineLabelOwner.run):
(DetermineLabelOwner.getResultSummary):
(RemoveAndAddLabels):
(RemoveAndAddLabels.__init__):
(RemoveAndAddLabels.run):
(RemoveAndAddLabels.getResultSummary):
(RemoveAndAddLabels.update_labels):
(RetrievePRDataFromLabel):
(RetrievePRDataFromLabel.__init__):
(RetrievePRDataFromLabel.run):
(RetrievePRDataFromLabel.getResultSummary):
(RetrievePRDataFromLabel.getAllPRData):
(CheckStatusOfPR):
(CheckStatusOfPR.__init__):
(CheckStatusOfPR.run):
(CheckStatusOfPR.getResultSummary):
(CheckStatusOfPR.checkPRStatus):
(CheckStatusOfPR.getQueueStatusFromList):
(AddMergeLabelsToPRs):
(AddMergeLabelsToPRs.run):
(AddMergeLabelsToPRs.getResultSummary):
* Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: https://commits.webkit.org/268847@main

7dd0e8f

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-09-07T21:14:44Z

EWS run on previous version of this PR (hash 564f7bb)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	~~🧪 api-mac~~	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	~~🧪 gtk-wk2~~
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

JonWBedard · 2023-09-07T21:13:47Z

Tools/CISupport/ews-build/config.json

+    {
+      "name": "Safe-Merge-Queue", "shortname": "safe-merge", "icon": "testOnly",
+      "factory": "SafeMergeQueueFactory", "platform": "*",
+      "workernames": ["ews151"]


Presumably this is just for testing, the final version should be run on the same machines tasked with merge-queue.

Since we're nearing landing this, it's time to switch this to the correct worker names (ie, our merge-queue bots)

JonWBedard · 2023-09-07T21:14:22Z

Tools/CISupport/ews-build/steps.py

@@ -145,6 +146,7 @@ def credentials(cls, user=None):
            return cls._cache[prefix]

        try:
+            print("i bet there's no passwords.json")


Nit: Remove debugging statement

Good catch ^^"

JonWBedard · 2023-09-07T21:16:09Z

Tools/CISupport/ews-build/steps.py

+        query = {'query': query_body}
+        num_prs = self.queryGraphQL(query)['data']['repository']['pullRequests']['totalCount']
+        if num_prs:
+            yield self._addToLog('stdio', 'There are {} PRs in safe-merge-queue.'.format(num_prs))


Every function with a yield should be decorated with @defer.inlineCallbacks and every function invoking a function with @defer.inlineCallbacks needs to preface that invocation of with yield

JonWBedard · 2023-09-07T21:17:44Z

Tools/CISupport/ews-build/steps.py

+            return {'step': f"Failed to request and filter pull requests"}
+        return buildstep.BuildStep.getResultSummary(self)
+
+    def queryGraphQL(self, payload):


I think this should be moved to the GitHub mixin class.

JonWBedard · 2023-09-07T21:18:06Z

Tools/CISupport/ews-build/steps.py

+            else:
+                return FAILURE
+            self.setProperty('safe_pr_list', label_as_safe)
+            self._addToLog('stdio', 'PRs to merge: {}.'.format(label_as_safe))


_addToLog is asynchronous and should be prefaced with yield

JonWBedard · 2023-09-07T21:28:00Z

Tools/CISupport/ews-build/steps_unittest.py

+    def test_success_sort(self):
+        self.setupStep(FilterPullRequestsIntoQueues())
+        FilterPullRequestsIntoQueues.getNumPRs = lambda label: 4
+        query_result = {'data': {'repository': {'pullRequests': {'edges': [{'node': {'title': 'Fix `test-webkitpy webkitflaskpy`', 'number': 17412, 'commits': {'nodes': [{'commit': {'commitUrl': 'https://github.com/WebKit/WebKit/commit/582fb8b4f85cc9f385c0e0809170cadc48c7fed5', 'status': {'state': 'SUCCESS', 'contexts': [{'context': 'api-gtk', 'state': 'SUCCESS'}, {'context': 'api-ios', 'state': 'SUCCESS'}, {'context': 'api-mac', 'state': 'SUCCESS'}, {'context': 'bindings', 'state': 'SUCCESS'}, {'context': 'gtk', 'state': 'SUCCESS'}, {'context': 'gtk-wk2', 'state': 'SUCCESS'}, {'context': 'ios', 'state': 'SUCCESS'}, {'context': 'ios-sim', 'state': 'SUCCESS'}, {'context': 'ios-wk2', 'state': 'SUCCESS'}, {'context': 'ios-wk2-wpt', 'state': 'SUCCESS'}, {'context': 'jsc', 'state': 'SUCCESS'}, {'context': 'jsc-arm64', 'state': 'SUCCESS'}, {'context': 'jsc-armv7', 'state': 'SUCCESS'}, {'context': 'jsc-i386', 'state': 'SUCCESS'}, {'context': 'jsc-mips', 'state': 'SUCCESS'}, {'context': 'mac', 'state': 'SUCCESS'}, {'context': 'mac-AS-debug', 'state': 'SUCCESS'}, {'context': 'mac-AS-debug-wk2', 'state': 'SUCCESS'}, {'context': 'mac-wk1', 'state': 'SUCCESS'}, {'context': 'mac-wk2', 'state': 'SUCCESS'}, {'context': 'mac-wk2-stress', 'state': 'SUCCESS'}, {'context': 'services', 'state': 'SUCCESS'}, {'context': 'style', 'state': 'SUCCESS'}, {'context': 'tv', 'state': 'SUCCESS'}, {'context': 'tv-sim', 'state': 'SUCCESS'}, {'context': 'watch', 'state': 'SUCCESS'}, {'context': 'watch-sim', 'state': 'SUCCESS'}, {'context': 'webkitperl', 'state': 'SUCCESS'}, {'context': 'webkitpy', 'state': 'SUCCESS'}, {'context': 'wincairo', 'state': 'SUCCESS'}, {'context': 'wpe', 'state': 'SUCCESS'}, {'context': 'wpe-wk2', 'state': 'SUCCESS'}]}}}]}}}, {'node': {'title': 'Import WPT css/compositing directory', 'number': 17418, 'commits': {'nodes': [{'commit': {'commitUrl': 'https://github.com/WebKit/WebKit/commit/b8df1771f6cb7197bcc8c3940670a24b8cd77d47', 'status': {'state': 'SUCCESS', 'contexts': [{'context': 'bindings', 'state': 'SUCCESS'}, {'context': 'ios', 'state': 'SUCCESS'}, {'context': 'jsc-arm64', 'state': 'SUCCESS'}, {'context': 'jsc-armv7', 'state': 'SUCCESS'}, {'context': 'jsc-i386', 'state': 'SUCCESS'}, {'context': 'jsc-mips', 'state': 'SUCCESS'}, {'context': 'services', 'state': 'SUCCESS'}, {'context': 'style', 'state': 'SUCCESS'}, {'context': 'tv', 'state': 'SUCCESS'}, {'context': 'watch-sim', 'state': 'SUCCESS'}, {'context': 'webkitperl', 'state': 'SUCCESS'}, {'context': 'webkitpy', 'state': 'SUCCESS'}, {'context': 'wpe', 'state': 'SUCCESS'}]}}}]}}}, {'node': {'title': 'Test safe-merge-queue labelling', 'number': 17451, 'commits': {'nodes': [{'commit': {'commitUrl': 'https://github.com/WebKit/WebKit/commit/b12b5ee6709e3ce6a9019342a12eded04975af18', 'status': {'state': 'FAILURE', 'contexts': [{'context': 'style', 'state': 'FAILURE'}, {'context': 'api-gtk', 'state': 'SUCCESS'}, {'context': 'api-ios', 'state': 'SUCCESS'}, {'context': 'api-mac', 'state': 'SUCCESS'}, {'context': 'bindings', 'state': 'SUCCESS'}, {'context': 'gtk', 'state': 'SUCCESS'}, {'context': 'ios', 'state': 'SUCCESS'}, {'context': 'ios-sim', 'state': 'SUCCESS'}, {'context': 'ios-wk2', 'state': 'SUCCESS'}, {'context': 'jsc', 'state': 'SUCCESS'}, {'context': 'jsc-arm64', 'state': 'SUCCESS'}, {'context': 'jsc-armv7', 'state': 'SUCCESS'}, {'context': 'jsc-i386', 'state': 'SUCCESS'}, {'context': 'jsc-mips', 'state': 'SUCCESS'}, {'context': 'mac', 'state': 'SUCCESS'}, {'context': 'mac-AS-debug', 'state': 'SUCCESS'}, {'context': 'mac-wk1', 'state': 'SUCCESS'}, {'context': 'mac-wk2', 'state': 'SUCCESS'}, {'context': 'mac-wk2-stress', 'state': 'SUCCESS'}, {'context': 'services', 'state': 'SUCCESS'}, {'context': 'tv', 'state': 'SUCCESS'}, {'context': 'tv-sim', 'state': 'SUCCESS'}, {'context': 'watch', 'state': 'SUCCESS'}, {'context': 'watch-sim', 'state': 'SUCCESS'}, {'context': 'webkitperl', 'state': 'SUCCESS'}, {'context': 'webkitpy', 'state': 'SUCCESS'}, {'context': 'wpe', 'state': 'SUCCESS'}]}}}]}}}, {'node': {'title': 'Split webkitpy.common.net.bugzilla.TestExpectationUpdater', 'number': 17454, 'commits': {'nodes': [{'commit': {'commitUrl': 'https://github.com/WebKit/WebKit/commit/4b36be2acc1b4b3190f93c69acd6484e58b35ef0', 'status': {'state': 'SUCCESS', 'contexts': [{'context': 'api-gtk', 'state': 'SUCCESS'}, {'context': 'bindings', 'state': 'SUCCESS'}, {'context': 'gtk', 'state': 'SUCCESS'}, {'context': 'ios', 'state': 'SUCCESS'}, {'context': 'ios-sim', 'state': 'SUCCESS'}, {'context': 'jsc-arm64', 'state': 'SUCCESS'}, {'context': 'jsc-armv7', 'state': 'SUCCESS'}, {'context': 'jsc-i386', 'state': 'SUCCESS'}, {'context': 'jsc-mips', 'state': 'SUCCESS'}, {'context': 'mac-AS-debug', 'state': 'SUCCESS'}, {'context': 'services', 'state': 'SUCCESS'}, {'context': 'style', 'state': 'SUCCESS'}, {'context': 'tv', 'state': 'SUCCESS'}, {'context': 'watch-sim', 'state': 'SUCCESS'}, {'context': 'webkitperl', 'state': 'SUCCESS'}, {'context': 'webkitpy', 'state': 'SUCCESS'}, {'context': 'wpe', 'state': 'SUCCESS'}]}}}]}}}]}}}}


Can we organize this JSON a bit better? Maybe pretty-print it?

JonWBedard · 2023-09-07T21:29:54Z

Tools/CISupport/ews-build/steps.py

+        failed_status_check = []
+        no_checks = []
+
+        ignore_contexts = ['style', 'webkitperl', 'wpe', 'wpe-wk2', 'gtk', 'gtk-wk2', 'api-gtk', 'wincaire']


I think we want the reverse here: we want to list the tests we require to have passed before landing.

Sure, that would just change the proceeding logic a little. But, wouldn't it be preferable if a new test was added and required by default? In the required list implementation, I could see a test added to EWS but not this list and then a PR with an error going into merge-queue.

New EWS queues usually start as experimental. The bigger sticking point, though, is that's it's possible for a build to be pending. In that case, we don't want safe-merge-queue to be triggered (yet). The pending case is challenging because there may not be a context reported yet.

Okay, I'll make the change. I'm currently putting all PRs with no status into its own list that's ignored, perhaps that takes care of pending builds?

webkit-early-warning-system · 2023-09-07T22:32:16Z

EWS run on previous version of this PR (hash 64a3e59)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

briannafan · 2023-09-07T22:45:11Z

Tools/CISupport/ews-build/steps.py

@@ -193,6 +195,34 @@ def fetch_data_from_url_with_authentication_github(self, url):
        else:
            defer.returnValue(response)

+    @defer.inlineCallbacks


@JonWBedard Tried implementing twistd requests here and moved the function to GitHubMixin as requested!

webkit-early-warning-system · 2023-09-08T01:53:46Z

EWS run on previous version of this PR (hash 4887571)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
❌ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-09-28T21:23:57Z

EWS run on previous version of this PR (hash f70ec11)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 wincairo~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	✅ 🛠 gtk
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🧪 api-gtk~~
	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2
~~🧪 services~~	✅ 🛠 tv-sim
	✅ 🛠 watch
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2023-09-28T21:31:01Z

EWS run on previous version of this PR (hash 3089173)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

rniwa · 2023-09-30T16:36:10Z

What is safe-merge-queue and how it's different from regular merge-queue? That should be explained in the commit message.

JonWBedard · 2023-10-02T15:22:09Z

Tools/CISupport/ews-build/factories.py

+    def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
+        super().__init__()
+        for project in GITHUB_PROJECTS:
+            self.addStep(RetrievePRDataFromLabel(project, label='\"safe-merge-queue\"'))


Nit: I don't think we should be quoting the label name here. And the label name should probably be a variable (as our other label names names are). I do really like the fact that this label is passed as an argument to RetrievePRDataFromLabel, so let's be suer to keep that!

JonWBedard · 2023-10-02T15:25:33Z

Tools/CISupport/ews-build/steps.py

@@ -236,6 +236,20 @@ def query_graph_ql(self, payload):
            data = json.loads(response.text)
            defer.returnValue(data)

+    @defer.inlineCallbacks
+    def get_number_of_prs_with_label(self, label='\"safe-merge-queue\"'):


This shouldn't have a default argument, since we only every call it by passing an argument (and I can't really see how future code would benefit from a default argument)

JonWBedard · 2023-10-02T15:27:59Z

Tools/CISupport/ews-build/steps.py

+    def __init__(self, project="WebKit/WebKit", label='\"safe-merge-queue\"', **kwargs):
+        self.project = project
+        owner, name = project.lower().split('/', 1)
+        self.name = f'retrieve-pr-data-from-{owner}-{name}'


This should be:

self.name = f'{self.name}-{owner}-{name}'

otherwise the class defined variable is completely useless.

JonWBedard · 2023-10-02T15:29:38Z

Tools/CISupport/ews-build/steps.py

+    QUEUES_FOR_SAFE_MERGE_QUEUE = EMBEDDED_CHECKS + MACOS_CHECKS
+
+    def __init__(self, pr_number='', **kwargs):
+        self.name = f'check-status-of-pr-{pr_number}-in-safe-merge-queue'


Ditto on basing this on the class variable. Note that this does work in Python, and this is probably the right time to deploy this sort of tactic:

template_str = 'abc-{}-123' resolved_str = template_str.format('def')

{} aren't allowed to be in Buildbot identifiers and makes unit tests fail. However, I think the step needs to be renamed anyways since it doesn't have to be safe-merge-queue specific, and it's only checking one PR, not multiple PRs. So now it's CheckStatusOfPR() with self.name = '{self.name}-{pr_number}'

webkit-early-warning-system · 2023-10-02T22:02:55Z

EWS run on current version of this PR (hash 938f873)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
⏳ 🧪 style	⏳ 🛠 ios	🛠 mac	⏳ 🛠 wpe	⏳ 🛠 wincairo
🧪 bindings	⏳ 🛠 ios-sim	⏳ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
🧪 webkitperl	⏳ 🧪 ios-wk2	🧪 api-mac	⏳ 🛠 gtk
	⏳ 🧪 ios-wk2-wpt	🧪 mac-wk1	⏳ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc	⏳ 🧪 api-ios	🧪 mac-wk2	⏳ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	🛠 jsc-armv7
🧪 services	⏳ 🛠 tv-sim	🧪 mac-wk2-stress	🧪 jsc-armv7-tests
	⏳ 🛠 watch		🛠 jsc-mips
	⏳ 🛠 watch-sim		🧪 jsc-mips-tests

webkit-early-warning-system · 2023-10-02T22:02:56Z

EWS run on previous version of this PR (hash 938f873)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
❌ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

rniwa

Implementation of safe-merge-queue label through Buildbot that filters PRs through EWS checks into merge-queue and merging-blocked.

This description is still not self explanatory. Please use a full sentence to explain it.

briannafan · 2023-10-02T22:20:47Z

@rniwa There's still a bit of testing to do; I will update the commit message after that.

webkit-early-warning-system · 2023-10-03T02:15:45Z

EWS run on previous version of this PR (hash bc8efdc)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	~~🧪 api-mac~~	✅ 🛠 gtk
	💥 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	⏳ 🧪 gtk-wk2
⏳ 🛠 🧪 jsc	✅ 🧪 api-ios	~~🧪 mac-wk2~~	✅ 🧪 api-gtk
⏳ 🛠 🧪 jsc-arm64	✅ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2
❌ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-10-03T02:30:19Z

EWS run on previous version of this PR (hash 99ce8ec)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
❌ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

JonWBedard

I want to collaborate with @briannafan on when to land and deploy, I am excited about this improvement!

webkit-early-warning-system · 2023-10-04T00:26:19Z

EWS run on current version of this PR (hash 7dd0e8f)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services	✅ 🛠 tv-sim
	✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim

https://bugs.webkit.org/show_bug.cgi?id=261288 rdar://114993838 Reviewed by Jonathan Bedard. Adding the safe-merge-queue label adds the PR to a queue which is periodically checked through BuildBot. If the PR passes EWS checks, merge-queue label is automatically added and the PR will be landed. If the label is not added by a committer, or if the PR does not pass EWS checks, merging-blocked label is added. * Tools/CISupport/ews-build/config.json: * Tools/CISupport/ews-build/factories.py: (UnsafeMergeQueueFactory.__init__): (SafeMergeQueueFactory): (SafeMergeQueueFactory.__init__): * Tools/CISupport/ews-build/factories_unittest.py: (TestExpectedBuildSteps): * Tools/CISupport/ews-build/loadConfig.py: * Tools/CISupport/ews-build/steps.py: (GitHubMixin): (GitHubMixin.get_number_of_prs_with_label): (ValidateCommitterAndReviewer): (ValidateCommitterAndReviewer.fail_build): (ValidateCommitterAndReviewer.run): (DetermineLabelOwner.run): (DetermineLabelOwner.getResultSummary): (RemoveAndAddLabels): (RemoveAndAddLabels.__init__): (RemoveAndAddLabels.run): (RemoveAndAddLabels.getResultSummary): (RemoveAndAddLabels.update_labels): (RetrievePRDataFromLabel): (RetrievePRDataFromLabel.__init__): (RetrievePRDataFromLabel.run): (RetrievePRDataFromLabel.getResultSummary): (RetrievePRDataFromLabel.getAllPRData): (CheckStatusOfPR): (CheckStatusOfPR.__init__): (CheckStatusOfPR.run): (CheckStatusOfPR.getResultSummary): (CheckStatusOfPR.checkPRStatus): (CheckStatusOfPR.getQueueStatusFromList): (AddMergeLabelsToPRs): (AddMergeLabelsToPRs.run): (AddMergeLabelsToPRs.getResultSummary): * Tools/CISupport/ews-build/steps_unittest.py: Canonical link: https://commits.webkit.org/268847@main

webkit-commit-queue · 2023-10-04T15:41:23Z

Committed 268847@main (d3044ed): https://commits.webkit.org/268847@main

Reviewed commits have been landed. Closing PR #17552 and removing active labels.

briannafan requested review from aj062, JonWBedard and ryanhaddad as code owners September 7, 2023 21:04

briannafan self-assigned this Sep 7, 2023

briannafan added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Sep 7, 2023

JonWBedard reviewed Sep 7, 2023

View reviewed changes

briannafan force-pushed the eng/114993838 branch from 564f7bb to 64a3e59 Compare September 7, 2023 22:32

briannafan commented Sep 7, 2023

View reviewed changes

briannafan added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Sep 8, 2023

webkit-ews-buildbot added safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Sep 8, 2023

briannafan force-pushed the eng/114993838 branch from 64a3e59 to 4887571 Compare September 8, 2023 01:48

webkit-ews-buildbot added safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Sep 8, 2023

webkit-ews-buildbot added merging-blocked Applied to prevent a change from being merged and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Sep 28, 2023

briannafan removed the merging-blocked Applied to prevent a change from being merged label Sep 28, 2023

briannafan force-pushed the eng/114993838 branch from d7499c8 to f70ec11 Compare September 28, 2023 21:20

briannafan force-pushed the eng/114993838 branch from f70ec11 to 3089173 Compare September 28, 2023 21:29

JonWBedard reviewed Oct 2, 2023

View reviewed changes

briannafan force-pushed the eng/114993838 branch from 3089173 to 938f873 Compare October 2, 2023 22:02

rniwa requested changes Oct 2, 2023

View reviewed changes

briannafan force-pushed the eng/114993838 branch from 938f873 to bc8efdc Compare October 3, 2023 02:12

briannafan force-pushed the eng/114993838 branch from bc8efdc to 99ce8ec Compare October 3, 2023 02:27

JonWBedard requested a review from rniwa October 3, 2023 15:01

JonWBedard approved these changes Oct 3, 2023

View reviewed changes

briannafan force-pushed the eng/114993838 branch from 99ce8ec to 7dd0e8f Compare October 4, 2023 00:23

JonWBedard added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Oct 4, 2023

webkit-commit-queue force-pushed the eng/114993838 branch from 7dd0e8f to d3044ed Compare October 4, 2023 15:41

webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Oct 4, 2023

webkit-commit-queue merged commit d3044ed into WebKit:main Oct 4, 2023

briannafan deleted the eng/114993838 branch December 12, 2023 18:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement safe-merge-queue #17552

Implement safe-merge-queue #17552

briannafan commented Sep 7, 2023 •

edited by webkit-early-warning-system

Loading

webkit-early-warning-system commented Sep 7, 2023 •

edited

Loading

JonWBedard Sep 7, 2023

JonWBedard Sep 21, 2023

JonWBedard Sep 7, 2023

briannafan Sep 7, 2023

JonWBedard Sep 7, 2023

JonWBedard Sep 7, 2023

JonWBedard Sep 7, 2023

JonWBedard Sep 7, 2023

JonWBedard Sep 7, 2023

briannafan Sep 7, 2023

JonWBedard Sep 7, 2023

briannafan Sep 7, 2023

webkit-early-warning-system commented Sep 7, 2023 •

edited

Loading

briannafan Sep 7, 2023

webkit-early-warning-system commented Sep 8, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 28, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 28, 2023 •

edited

Loading

rniwa commented Sep 30, 2023

JonWBedard Oct 2, 2023

JonWBedard Oct 2, 2023

JonWBedard Oct 2, 2023

JonWBedard Oct 2, 2023

briannafan Oct 2, 2023

webkit-early-warning-system commented Oct 2, 2023 •

edited

Loading

webkit-early-warning-system commented Oct 2, 2023 •

edited

Loading

rniwa left a comment

briannafan commented Oct 2, 2023

webkit-early-warning-system commented Oct 3, 2023 •

edited

Loading

webkit-early-warning-system commented Oct 3, 2023 •

edited

Loading

JonWBedard left a comment

webkit-early-warning-system commented Oct 4, 2023 •

edited

Loading

webkit-commit-queue commented Oct 4, 2023

Implement safe-merge-queue #17552

Implement safe-merge-queue #17552

Conversation

briannafan commented Sep 7, 2023 • edited by webkit-early-warning-system Loading

webkit-early-warning-system commented Sep 7, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

webkit-early-warning-system commented Sep 7, 2023 • edited Loading

Choose a reason for hiding this comment

webkit-early-warning-system commented Sep 8, 2023 • edited Loading

webkit-early-warning-system commented Sep 28, 2023 • edited Loading

webkit-early-warning-system commented Sep 28, 2023 • edited Loading

rniwa commented Sep 30, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

webkit-early-warning-system commented Oct 2, 2023 • edited Loading

webkit-early-warning-system commented Oct 2, 2023 • edited Loading

rniwa left a comment

Choose a reason for hiding this comment

briannafan commented Oct 2, 2023

webkit-early-warning-system commented Oct 3, 2023 • edited Loading

webkit-early-warning-system commented Oct 3, 2023 • edited Loading

JonWBedard left a comment

Choose a reason for hiding this comment

webkit-early-warning-system commented Oct 4, 2023 • edited Loading

webkit-commit-queue commented Oct 4, 2023

briannafan commented Sep 7, 2023 •

edited by webkit-early-warning-system

Loading

webkit-early-warning-system commented Sep 7, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 7, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 8, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 28, 2023 •

edited

Loading

webkit-early-warning-system commented Sep 28, 2023 •

edited

Loading

webkit-early-warning-system commented Oct 2, 2023 •

edited

Loading

webkit-early-warning-system commented Oct 2, 2023 •

edited

Loading

webkit-early-warning-system commented Oct 3, 2023 •

edited

Loading

webkit-early-warning-system commented Oct 3, 2023 •

edited

Loading

webkit-early-warning-system commented Oct 4, 2023 •

edited

Loading