From 28e353cf3286330d4fe5ac7587c58c05e3e56a62 Mon Sep 17 00:00:00 2001 From: John Strizich Date: Wed, 22 Nov 2017 11:01:19 -0800 Subject: [PATCH] move patch logic to openrs builder config Summary: Removing git patch logic from fbcode builder and into the openr config. Making the patch available for travis build via curl. Reviewed By: saifhhasan Differential Revision: D6394924 fbshipit-source-id: 008f58bdf9d10fc730368bc23e1c49a43afc06e1 --- build/fbcode_builder/fbcode_builder.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/build/fbcode_builder/fbcode_builder.py b/build/fbcode_builder/fbcode_builder.py index 6d4f7e907..f335792c0 100644 --- a/build/fbcode_builder/fbcode_builder.py +++ b/build/fbcode_builder/fbcode_builder.py @@ -266,15 +266,6 @@ class FBCodeBuilder(object): ] if git_hash else [] base_dir = self.option('projects_dir') - git_patch = self.option('{0}:git_patch'.format(project), '') - patch_file = path_join( - base_dir, - '../shipit_projects' if self.has_option('shipit_project_dir') else '', - git_patch - ) - maybe_apply_patch = [ - self.run(ShellQuoted('git apply {p}').format(p=patch_file)), - ] if git_patch else [] local_repo_dir = self.option('{0}:local_repo_dir'.format(project), '') return self.step('Check out {0}, workdir {1}'.format(project, path), [ @@ -285,7 +276,7 @@ class FBCodeBuilder(object): local_repo_dir, os.path.basename(project) ), self.workdir(path_join(base_dir, os.path.basename(project), path)), - ] + maybe_change_branch + maybe_apply_patch) + ] + maybe_change_branch) def fb_github_project_workdir(self, project_and_path, github_org='facebook'): 'This helper lets Facebook-internal CI special-cases FB projects'