mirror of
https://github.com/facebook/proxygen.git
synced 2025-08-08 18:02:05 +03:00
getdeps: add xxhash ubuntu and homebrew packages, fix actions generation and regenerate
Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1010 EdenFS build on github CI was failing with missing xxhash include: https://github.com/facebook/sapling/actions/runs/11311478649/job/31457761727#step:108:3838 Add package mappings to the xxhash manifest When I went to regenerate the github actions found I'd previously introduced a bug in the actions generation with a mis-merged run_tests check. Fix it and regenerate X-link: https://github.com/facebook/sapling/pull/966 Reviewed By: genevievehelsel Differential Revision: D64302134 Pulled By: ahornby fbshipit-source-id: 3384dab4f31e202881310e2b5369bb23fb533a1b
This commit is contained in:
committed by
Facebook GitHub Bot
parent
94c7b20002
commit
3860d2e77c
@@ -959,6 +959,10 @@ class GenerateGitHubActionsCmd(ProjectCmdBase):
|
|||||||
def write_job_for_platform(self, platform, args): # noqa: C901
|
def write_job_for_platform(self, platform, args): # noqa: C901
|
||||||
build_opts = setup_build_options(args, platform)
|
build_opts = setup_build_options(args, platform)
|
||||||
ctx_gen = build_opts.get_context_generator()
|
ctx_gen = build_opts.get_context_generator()
|
||||||
|
if args.enable_tests:
|
||||||
|
ctx_gen.set_value_for_project(args.project, "test", "on")
|
||||||
|
else:
|
||||||
|
ctx_gen.set_value_for_project(args.project, "test", "off")
|
||||||
loader = ManifestLoader(build_opts, ctx_gen)
|
loader = ManifestLoader(build_opts, ctx_gen)
|
||||||
self.process_project_dir_arguments(args, loader)
|
self.process_project_dir_arguments(args, loader)
|
||||||
manifest = loader.load_manifest(args.project)
|
manifest = loader.load_manifest(args.project)
|
||||||
@@ -1081,7 +1085,10 @@ jobs:
|
|||||||
free_up_disk = ""
|
free_up_disk = ""
|
||||||
|
|
||||||
allow_sys_arg = ""
|
allow_sys_arg = ""
|
||||||
if run_tests:
|
if (
|
||||||
|
build_opts.allow_system_packages
|
||||||
|
and build_opts.host_type.get_package_manager()
|
||||||
|
):
|
||||||
sudo_arg = "sudo "
|
sudo_arg = "sudo "
|
||||||
allow_sys_arg = " --allow-system-packages"
|
allow_sys_arg = " --allow-system-packages"
|
||||||
if build_opts.host_type.get_package_manager() == "deb":
|
if build_opts.host_type.get_package_manager() == "deb":
|
||||||
@@ -1092,13 +1099,16 @@ jobs:
|
|||||||
if build_opts.is_darwin():
|
if build_opts.is_darwin():
|
||||||
# brew is installed as regular user
|
# brew is installed as regular user
|
||||||
sudo_arg = ""
|
sudo_arg = ""
|
||||||
|
tests_arg = "--no-tests "
|
||||||
|
if run_tests:
|
||||||
|
tests_arg = ""
|
||||||
out.write(
|
out.write(
|
||||||
f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive {manifest.name}\n"
|
f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps {tests_arg}--recursive {manifest.name}\n"
|
||||||
)
|
)
|
||||||
if build_opts.is_linux() or build_opts.is_freebsd():
|
if build_opts.is_linux() or build_opts.is_freebsd():
|
||||||
out.write(" - name: Install packaging system deps\n")
|
out.write(" - name: Install packaging system deps\n")
|
||||||
out.write(
|
out.write(
|
||||||
f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf\n"
|
f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps {tests_arg}--recursive patchelf\n"
|
||||||
)
|
)
|
||||||
required_locales = manifest.get(
|
required_locales = manifest.get(
|
||||||
"github.actions", "required_locales", ctx=manifest_ctx
|
"github.actions", "required_locales", ctx=manifest_ctx
|
||||||
@@ -1176,7 +1186,7 @@ jobs:
|
|||||||
no_deps_arg = "--no-deps "
|
no_deps_arg = "--no-deps "
|
||||||
|
|
||||||
no_tests_arg = ""
|
no_tests_arg = ""
|
||||||
if not args.enable_tests:
|
if not run_tests:
|
||||||
no_tests_arg = "--no-tests "
|
no_tests_arg = "--no-tests "
|
||||||
|
|
||||||
out.write(
|
out.write(
|
||||||
|
@@ -8,6 +8,13 @@ sha256 = baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4
|
|||||||
[rpms]
|
[rpms]
|
||||||
xxhash-devel
|
xxhash-devel
|
||||||
|
|
||||||
|
[debs]
|
||||||
|
libxxhash-dev
|
||||||
|
xxhash
|
||||||
|
|
||||||
|
[homebrew]
|
||||||
|
xxhash
|
||||||
|
|
||||||
[build.not(os=windows)]
|
[build.not(os=windows)]
|
||||||
builder = make
|
builder = make
|
||||||
subdir = xxHash-0.8.2
|
subdir = xxHash-0.8.2
|
||||||
|
Reference in New Issue
Block a user