Skip to content
Permalink
Browse files
[build.webkit.org] Upload minified archives while building custom rev…
…ision

https://bugs.webkit.org/show_bug.cgi?id=240354

Reviewed by Ryan Haddad.

* Tools/CISupport/build-webkit-org/steps.py:
(CompileWebKit.evaluateCommand):
(TransferToS3.__init__):
(TransferToS3.finished):

Canonical link: https://commits.webkit.org/250497@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294116 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aj062 committed May 12, 2022
1 parent 33d9668 commit 39df96febbbf78b250c8c7927e946b20c9e06198
Showing with 12 additions and 2 deletions.
  1. +12 −2 Tools/CISupport/build-webkit-org/steps.py
@@ -347,6 +347,12 @@ def _addToLog(self, logName, message):
log = yield self.addLog(logName)
log.addStdout(message)

def evaluateCommand(self, cmd):
rc = shell.ShellCommand.evaluateCommand(self, cmd)
if rc in (SUCCESS, WARNINGS) and self.getProperty('user_provided_git_hash'):
self.build.addStepsAfterCurrentStep([ArchiveMinifiedBuiltProduct(), UploadMinifiedBuiltProduct(), TransferToS3(terminate_build=True)])
return rc


class CompileLLINTCLoop(CompileWebKit):
command = ["perl", "Tools/Scripts/build-jsc", "--cloop", WithProperties("--%(configuration)s")]
@@ -1174,16 +1180,20 @@ class TransferToS3(master.MasterShellCommand):
command = ["python3", "../Shared/transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
haltOnFailure = True

def __init__(self, **kwargs):
def __init__(self, terminate_build=False, **kwargs):
kwargs['command'] = self.command
kwargs['logEnviron'] = False
self.terminate_build = terminate_build
master.MasterShellCommand.__init__(self, **kwargs)

def start(self):
return master.MasterShellCommand.start(self)

def finished(self, result):
return master.MasterShellCommand.finished(self, result)
rc = master.MasterShellCommand.finished(self, result)
if self.terminate_build and self.getProperty('user_provided_git_hash'):
self.build.buildFinished([f"Uploaded archive with hash {self.getProperty('user_provided_git_hash', '')[:8]}"], SUCCESS)
return rc

def doStepIf(self, step):
return CURRENT_HOSTNAME == BUILD_WEBKIT_HOSTNAME

0 comments on commit 39df96f

Please sign in to comment.