Title: [244021] trunk/Tools
- Revision
- 244021
- Author
- [email protected]
- Date
- 2019-04-08 09:32:11 -0700 (Mon, 08 Apr 2019)
Log Message
[ews-build] Do not upload archive when Compile Fails
https://bugs.webkit.org/show_bug.cgi?id=196674
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/ews-build/factories.py:
(BuildFactory.__init__): Remove steps which require dynamic decision about whether to run or not.
* BuildSlaveSupport/ews-build/steps.py:
(CompileWebKit.evaluateCommand): Dynamically decide which steps to run based on compile status.
(CompileWebKitToT.evaluateCommand): Explicitly override Compile.evaluateCommand so that it
doesn't inherit CompileWebKit.evaluateCommand which dynamically adds more steps.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (244020 => 244021)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-04-08 15:51:19 UTC (rev 244020)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-04-08 16:32:11 UTC (rev 244021)
@@ -70,11 +70,7 @@
Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
self.addStep(KillOldProcesses())
self.addStep(CompileWebKit())
- self.addStep(UnApplyPatchIfRequired())
- self.addStep(CompileWebKitToT())
if triggers:
- self.addStep(ArchiveBuiltProduct())
- self.addStep(UploadBuiltProduct())
self.addStep(trigger.Trigger(schedulerNames=triggers, set_properties=self.propertiesToPassToTriggers() or {}))
def propertiesToPassToTriggers(self):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (244020 => 244021)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-04-08 15:51:19 UTC (rev 244020)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-04-08 16:32:11 UTC (rev 244021)
@@ -518,7 +518,11 @@
def evaluateCommand(self, cmd):
if cmd.didFail():
self.setProperty('patchFailedToBuild', True)
+ self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(), CompileWebKitToT()])
+ else:
+ self.build.addStepsAfterCurrentStep([ArchiveBuiltProduct(), UploadBuiltProduct()])
+
return super(CompileWebKit, self).evaluateCommand(cmd)
@@ -532,7 +536,10 @@
def hideStepIf(self, results, step):
return not self.doStepIf(step)
+ def evaluateCommand(self, cmd):
+ return shell.Compile.evaluateCommand(self, cmd)
+
class CompileJSCOnly(CompileWebKit):
name = "build-jsc"
descriptionDone = ["Compiled JSC"]
Modified: trunk/Tools/ChangeLog (244020 => 244021)
--- trunk/Tools/ChangeLog 2019-04-08 15:51:19 UTC (rev 244020)
+++ trunk/Tools/ChangeLog 2019-04-08 16:32:11 UTC (rev 244021)
@@ -1,3 +1,17 @@
+2019-04-08 Aakash Jain <[email protected]>
+
+ [ews-build] Do not upload archive when Compile Fails
+ https://bugs.webkit.org/show_bug.cgi?id=196674
+
+ Reviewed by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/ews-build/factories.py:
+ (BuildFactory.__init__): Remove steps which require dynamic decision about whether to run or not.
+ * BuildSlaveSupport/ews-build/steps.py:
+ (CompileWebKit.evaluateCommand): Dynamically decide which steps to run based on compile status.
+ (CompileWebKitToT.evaluateCommand): Explicitly override Compile.evaluateCommand so that it
+ doesn't inherit CompileWebKit.evaluateCommand which dynamically adds more steps.
+
2019-04-08 Guillaume Emont <[email protected]>
Enable DFG on MIPS
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
