Changeset 244021 in webkit

Timestamp:

Apr 8, 2019 9:32:11 AM (5 years ago)

Author:

aakash_jain@apple.com

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.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/factories.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/steps.py (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/factories.py

@@ -71 +71 @@
         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 {}))
 

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -519 +519 @@
         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 +536 @@
     def hideStepIf(self, results, step):
         return not self.doStepIf(step)
+
+    def evaluateCommand(self, cmd):
+        return shell.Compile.evaluateCommand(self, cmd)
 
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-08  Aakash Jain  <aakash_jain@apple.com>
+
+        [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  <guijemont@igalia.com>