Title: [289737] trunk/Tools
- Revision
- 289737
- Author
- [email protected]
- Date
- 2022-02-14 07:28:07 -0800 (Mon, 14 Feb 2022)
Log Message
[EWS] Re-enable build retry for PRs
https://bugs.webkit.org/show_bug.cgi?id=236300
<rdar://problem/88628832>
Reviewed by Aakash Jain.
* Tools/CISupport/ews-build/steps.py:
(AnalyzeCompileWebKitResults.analyzeResults): Enable retry for PRs with failing builds.
(CleanGitRepo.run): Abort any failed rebases.
* Tools/CISupport/ews-build/steps_unittest.py:
Canonical link: https://commits.webkit.org/247222@main
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (289736 => 289737)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-02-14 15:19:44 UTC (rev 289736)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-02-14 15:28:07 UTC (rev 289737)
@@ -2055,16 +2055,11 @@
pr_number = self.getProperty('github.number')
if compile_without_patch_result == FAILURE:
- if pr_number:
- message = 'Unable to build WebKit without PR, please rebase the PR against {}'.format(self.getProperty('basename', 'ToT'))
- else:
- message = 'Unable to build WebKit without patch, retrying build'
-
+ message = 'Unable to build WebKit without {}, retrying build'.format('PR' if pr_number else 'patch')
self.descriptionDone = message
self.send_email_for_preexisting_build_failure()
self.finished(FAILURE)
- # Do not retry PRs, we end up in an infinite retry loop because we don't automatically rebase against ToT
- self.build.buildFinished([message], FAILURE if pr_number else RETRY)
+ self.build.buildFinished([message], RETRY)
return defer.succeed(None)
self.build.results = FAILURE
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (289736 => 289737)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-02-14 15:19:44 UTC (rev 289736)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-02-14 15:28:07 UTC (rev 289737)
@@ -1260,6 +1260,16 @@
self.expectOutcome(result=FAILURE, state_string='Unable to build WebKit without patch, retrying build (failure)')
return self.runStep()
+ def test_pr_with_main_failure(self):
+ previous_steps = [
+ mock_step(CompileWebKit(), results=FAILURE),
+ mock_step(CompileWebKitWithoutChange(), results=FAILURE),
+ ]
+ self.setupStep(AnalyzeCompileWebKitResults(), previous_steps=previous_steps)
+ self.setProperty('github.number', '1234')
+ self.expectOutcome(result=FAILURE, state_string='Unable to build WebKit without PR, retrying build (failure)')
+ return self.runStep()
+
def test_filter_logs_containing_error(self):
logs = 'In file included from WebCore/unified-sources/UnifiedSource263.cpp:4:\nImageBufferIOSurfaceBackend.cpp:108:30: error: definition of implicitly declared destructor'
expected_output = 'ImageBufferIOSurfaceBackend.cpp:108:30: error: definition of implicitly declared destructor'
Modified: trunk/Tools/ChangeLog (289736 => 289737)
--- trunk/Tools/ChangeLog 2022-02-14 15:19:44 UTC (rev 289736)
+++ trunk/Tools/ChangeLog 2022-02-14 15:28:07 UTC (rev 289737)
@@ -1,3 +1,16 @@
+2022-02-11 Jonathan Bedard <[email protected]>
+
+ [EWS] Re-enable build retry for PRs
+ https://bugs.webkit.org/show_bug.cgi?id=236300
+ <rdar://problem/88628832>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/steps.py:
+ (AnalyzeCompileWebKitResults.analyzeResults): Enable retry for PRs with failing builds.
+ (CleanGitRepo.run): Abort any failed rebases.
+ * CISupport/ews-build/steps_unittest.py:
+
2022-02-13 Brady Eidson <[email protected]>
Implement ServiceWorkerRegistration.showNotification()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
