WebKit Bugzilla
Attachment 358316 Details for
Bug 193138
: [ews-build] use svn-apply script to apply the patches
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch
ews-build-svn-apply.patch (text/plain), 4.26 KB, created by
Aakash Jain
on 2019-01-04 07:18:55 PST
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Aakash Jain
Created:
2019-01-04 07:18:55 PST
Size:
4.26 KB
patch
obsolete
>Index: Tools/ChangeLog >=================================================================== >--- Tools/ChangeLog (revision 239607) >+++ Tools/ChangeLog (working copy) >@@ -1,3 +1,19 @@ >+2019-01-04 Aakash Jain <aakash_jain@apple.com> >+ >+ [ews-build] use svn-apply script to apply the patches >+ https://bugs.webkit.org/show_bug.cgi?id=193138 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * BuildSlaveSupport/ews-build/factories.py: >+ (Factory.__init__): Add the ApplyPatch step. >+ * BuildSlaveSupport/ews-build/steps.py: >+ (CheckOutSource): Added step name. >+ (CheckOutSource.__init__): Used alwaysUseLatest so that it doesn't apply patch. >+ (ApplyPatch): Build step to apply patch using svn-apply script. >+ (UnApplyPatchIfRequired): >+ (UnApplyPatchIfRequired.__init__): Deleted, since the alwaysUseLatest parameter is now in base class. >+ > 2019-01-03 Ross Kirsling <ross.kirsling@sony.com> > > test262-runner misbehaves when test file YAML has a trailing space >Index: Tools/BuildSlaveSupport/ews-build/factories.py >=================================================================== >--- Tools/BuildSlaveSupport/ews-build/factories.py (revision 239607) >+++ Tools/BuildSlaveSupport/ews-build/factories.py (working copy) >@@ -34,6 +34,7 @@ class Factory(factory.BuildFactory): > factory.BuildFactory.__init__(self) > self.addStep(ConfigureBuild(platform, configuration, architectures, buildOnly, additionalArguments)) > self.addStep(CheckOutSource()) >+ self.addStep(ApplyPatch()) > > > class StyleFactory(Factory): >Index: Tools/BuildSlaveSupport/ews-build/steps.py >=================================================================== >--- Tools/BuildSlaveSupport/ews-build/steps.py (revision 239607) >+++ Tools/BuildSlaveSupport/ews-build/steps.py (working copy) >@@ -24,6 +24,7 @@ from buildbot.process import buildstep, > from buildbot.process.results import Results, SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION, RETRY > from buildbot.steps import master, shell, transfer > from buildbot.steps.source import git >+from buildbot.steps.worker import CompositeStepMixin > from twisted.internet import defer > > import re >@@ -91,6 +92,7 @@ class ConfigureBuild(buildstep.BuildStep > > > class CheckOutSource(git.Git): >+ name = 'clean-and-update-working-directory' > CHECKOUT_DELAY_AND_MAX_RETRIES_PAIR = (0, 2) > > def __init__(self, **kwargs): >@@ -98,10 +100,36 @@ class CheckOutSource(git.Git): > super(CheckOutSource, self).__init__(repourl=self.repourl, > retry=self.CHECKOUT_DELAY_AND_MAX_RETRIES_PAIR, > timeout=2 * 60 * 60, >+ alwaysUseLatest=True, > progress=True, > **kwargs) > > >+class ApplyPatch(shell.ShellCommand, CompositeStepMixin): >+ name = 'apply-patch' >+ description = ['applying-patch'] >+ descriptionDone = ['apply-patch'] >+ flunkOnFailure = True >+ haltOnFailure = True >+ command = ['Tools/Scripts/svn-apply', '--force', '.buildbot-diff'] >+ >+ def _get_patch(self): >+ sourcestamp = self.build.getSourceStamp(self.getProperty('codebase', '')) >+ if not sourcestamp or not sourcestamp.patch: >+ return None >+ return sourcestamp.patch[1] >+ >+ def start(self): >+ patch = self._get_patch() >+ if not patch: >+ self.finished(FAILURE) >+ return None >+ >+ d = self.downloadFileContentToWorker('.buildbot-diff', patch) >+ d.addCallback(lambda _: self.downloadFileContentToWorker('.buildbot-patched', 'patched\n')) >+ d.addCallback(lambda res: shell.ShellCommand.start(self)) >+ >+ > class CheckPatchRelevance(buildstep.BuildStep): > name = 'check-patch-relevance' > description = ['check-patch-relevance running'] >@@ -196,9 +224,6 @@ class CheckPatchRelevance(buildstep.Buil > class UnApplyPatchIfRequired(CheckOutSource): > name = 'unapply-patch' > >- def __init__(self, **kwargs): >- super(UnApplyPatchIfRequired, self).__init__(alwaysUseLatest=True, **kwargs) >- > def doStepIf(self, step): > return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedJSCTests') >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193138
: 358316 |
358319