Title: [291077] trunk/Tools
- Revision
- 291077
- Author
- jbed...@apple.com
- Date
- 2022-03-09 14:35:36 -0800 (Wed, 09 Mar 2022)
Log Message
[EWS] Support concept of 'blocked' pull requests
https://bugs.webkit.org/show_bug.cgi?id=237370
<rdar://problem/89689094>
Unreviewed follow-up fix.
Accidently landed change using string literals instead of variables.
* Tools/CISupport/ews-build/steps.py:
(GitHubMixin):
(GitHubMixin._is_pr_blocked):
(ValidateChange.validate_github):
(BlockPullRequest.start):
(BlockPullRequest.getResultSummary):
Canonical link: https://commits.webkit.org/248243@main
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (291076 => 291077)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-03-09 22:31:53 UTC (rev 291076)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-03-09 22:35:36 UTC (rev 291077)
@@ -139,6 +139,7 @@
addURLs = False
pr_open_states = ['open']
pr_closed_states = ['closed']
+ BLOCKED_LABEL = 'merging-blocked'
def fetch_data_from_url_with_authentication(self, url):
response = None
@@ -193,7 +194,7 @@
def _is_pr_blocked(self, pr_json):
for label in (pr_json or {}).get('labels', {}):
- if label.get('name', '') == 'blocked':
+ if label.get('name', '') == self.BLOCKED_LABEL:
return 1
return 0
@@ -1327,7 +1328,7 @@
blocked = self._is_pr_blocked(pr_json) if self.verifyReviewDenied else 0
if blocked == 1:
- self.skip_build("PR {} has been marked as 'blocked'".format(pr_number))
+ self.skip_build("PR {} has been marked as '{}'".format(pr_number, self.BLOCKED_LABEL))
return False
if -1 in (obsolete, pr_closed, blocked):
@@ -1493,7 +1494,7 @@
rc = SKIPPED
if CURRENT_HOSTNAME == EWS_BUILD_HOSTNAME:
- rc = SUCCESS if self.modify_label(pr_number, 'blocked', repository_url=self.getProperty('repository', '')) else FAILURE
+ rc = SUCCESS if self.modify_label(pr_number, self.BLOCKED_LABEL, repository_url=self.getProperty('repository', '')) else FAILURE
self.finished(rc)
if build_finish_summary:
self.build.buildFinished([build_finish_summary], FAILURE)
@@ -1501,10 +1502,10 @@
def getResultSummary(self):
if self.results == SUCCESS:
- return {'step': 'Added blocked label pull request'}
+ return {'step': "Added '' label pull request".format(self.BLOCKED_LABEL)}
elif self.results == SKIPPED:
return buildstep.BuildStep.getResultSummary(self)
- return {'step': 'Failed to add blocked label to pull request'}
+ return {'step': "Failed to add '{}' label to pull request".format(self.BLOCKED_LABEL)}
def doStepIf(self, step):
return self.getProperty('github.number')
Modified: trunk/Tools/ChangeLog (291076 => 291077)
--- trunk/Tools/ChangeLog 2022-03-09 22:31:53 UTC (rev 291076)
+++ trunk/Tools/ChangeLog 2022-03-09 22:35:36 UTC (rev 291077)
@@ -1,3 +1,20 @@
+2022-03-09 Jonathan Bedard <jbed...@apple.com>
+
+ [EWS] Support concept of 'blocked' pull requests
+ https://bugs.webkit.org/show_bug.cgi?id=237370
+ <rdar://problem/89689094>
+
+ Unreviewed follow-up fix.
+
+ Accidently landed change using string literals instead of variables.
+
+ * CISupport/ews-build/steps.py:
+ (GitHubMixin):
+ (GitHubMixin._is_pr_blocked):
+ (ValidateChange.validate_github):
+ (BlockPullRequest.start):
+ (BlockPullRequest.getResultSummary):
+
2022-03-09 Lauro Moura <lmo...@igalia.com>
[Tools] Add script to query results database
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
