From 6ef17b6e6cc158589264d8b31e6bc48ece0e7bc3 Mon Sep 17 00:00:00 2001 From: John Strizich Date: Thu, 12 Oct 2017 19:43:58 -0700 Subject: [PATCH] install libnl from github for fbcode builder Summary: travis ci machines do not have libnl installed, this installs it. Reviewed By: saifhhasan Differential Revision: D6026428 fbshipit-source-id: 70b00a854ab437b69e93ee6b53da83ba58b4d8a2 --- build/fbcode_builder/fbcode_builder.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/fbcode_builder.py b/build/fbcode_builder/fbcode_builder.py index cde97c9fd..17b7a6d09 100644 --- a/build/fbcode_builder/fbcode_builder.py +++ b/build/fbcode_builder/fbcode_builder.py @@ -261,6 +261,11 @@ class FBCodeBuilder(object): self.run(ShellQuoted('git checkout {hash}').format(hash=git_hash)), ] if git_hash else [] + git_patch = self.option('{0}:git_patch'.format(project), '') + maybe_apply_patch = [ + self.run(ShellQuoted('git apply {patch}').format(patch=git_patch)), + ] if git_patch else [] + base_dir = self.option('projects_dir') local_repo_dir = self.option('{0}:local_repo_dir'.format(project), '') return self.step('Check out {0}, workdir {1}'.format(project, path), [ @@ -272,7 +277,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_change_branch + maybe_apply_patch) def fb_github_project_workdir(self, project_and_path, github_org='facebook'): 'This helper lets Facebook-internal CI special-cases FB projects'