Skip to content

Commit 99ca509

Browse files
ahornbyfacebook-github-bot
authored andcommitted
fix project_install_prefix for generate-github-actions
Summary: X-link: facebook/sapling#952 fix getdeps generate-github-actions by adding missing process_project_dir_arguments. Without this couldn't specify any project_install_prefix other that the default /usr/local mononoke installs directly to getdeps inst dir so needs a project_install_prefix of / for the artifact discovery to work regenerated the gh actions with `python3 fbcode/opensource/fbcode_builder/getdeps.py generate-github-actions mononoke --os-type=linux --allow-system-packages --output-dir fbcode/eden/oss/.github/workflows --job-file-prefix mononoke_ --job-name-prefix "Mononoke " --free-up-disk --project-install-prefix mononoke:/` Resolves facebook/sapling#922 Reviewed By: bigfootjon Differential Revision: D63031271 fbshipit-source-id: 768a4fbd7617c6061eca66b4d916ac25a4b66be9
1 parent aadf90b commit 99ca509

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

build/fbcode_builder/getdeps.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901
960960
build_opts = setup_build_options(args, platform)
961961
ctx_gen = build_opts.get_context_generator()
962962
loader = ManifestLoader(build_opts, ctx_gen)
963+
self.process_project_dir_arguments(args, loader)
963964
manifest = loader.load_manifest(args.project)
964965
manifest_ctx = loader.ctx_gen.get_context(manifest.name)
965966
run_on = self.get_run_on(args)
@@ -1147,8 +1148,10 @@ def write_job_for_platform(self, platform, args): # noqa: C901
11471148

11481149
project_prefix = ""
11491150
if not build_opts.is_windows():
1150-
project_prefix = (
1151-
" --project-install-prefix %s:/usr/local" % manifest.name
1151+
prefix = loader.get_project_install_prefix(manifest) or "/usr/local"
1152+
project_prefix = " --project-install-prefix %s:%s" % (
1153+
manifest.name,
1154+
prefix,
11521155
)
11531156

11541157
# If we have dep from same repo, we already built it and don't want to rebuild it again

0 commit comments

Comments
 (0)