mononoke/fbcode_builder: bring back mononoke manifests for getdeps build

Summary:
The breakage has been fixed, so bring back the manifest, but only the Linux one, because the Mac version is failing due to another issue.

Also to make it easier to debug issues on GitHub Actions separate out the dependencies build from Mononoke and rust-shed builds.

Reviewed By: krallin

Differential Revision: D21448412

fbshipit-source-id: 68d89c858d1692727a7fd66bca114920e6dfb4dc
This commit is contained in:
Lukas Piatkowski 2020-05-07 23:43:18 -07:00 committed by Facebook GitHub Bot
parent dc377e35d2
commit abe2c69df3
3 changed files with 63 additions and 3 deletions

View File

@ -19,8 +19,10 @@ jobs:
toolchain: stable
default: true
profile: minimal
- name: Build dependencies
run: python3 build/fbcode_builder/getdeps.py build --only-deps --src-dir=. mononoke
- name: Build mononoke
run: python3 build/fbcode_builder/getdeps.py build --src-dir=. mononoke
run: python3 build/fbcode_builder/getdeps.py build --no-deps --src-dir=. mononoke
- name: Copy artifacts
run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --src-dir=. mononoke _artifacts/linux
- uses: actions/upload-artifact@master
@ -57,8 +59,10 @@ jobs:
toolchain: stable
default: true
profile: minimal
- name: Build dependencies
run: python3 build/fbcode_builder/getdeps.py build --only-deps --src-dir=. mononoke
- name: Build mononoke
run: python3 build/fbcode_builder/getdeps.py build --src-dir=. mononoke
run: python3 build/fbcode_builder/getdeps.py build --no-deps --src-dir=. mononoke
- name: Copy artifacts
run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --src-dir=. mononoke _artifacts/mac
- uses: actions/upload-artifact@master

View File

@ -468,7 +468,12 @@ class BuildCmd(ProjectCmdBase):
build_dir = loader.get_project_build_dir(m)
inst_dir = loader.get_project_install_dir(m)
if m == manifest or not args.no_deps:
if (
m == manifest
and not args.only_deps
or m != manifest
and not args.no_deps
):
print("Assessing %s..." % m.name)
project_hash = loader.get_project_hash(m)
ctx = loader.ctx_gen.get_context(m.name)
@ -610,6 +615,16 @@ class BuildCmd(ProjectCmdBase):
"slow up-to-date-ness checks"
),
)
parser.add_argument(
"--only-deps",
action="store_true",
default=False,
help=(
"Only build the named project's deps. "
"This is most useful when you want to separate out building "
"of all of the deps and your project"
),
)
parser.add_argument(
"--no-build-cache",
action="store_false",

View File

@ -0,0 +1,41 @@
[manifest]
name = mononoke
fbsource_path = fbcode/eden
shipit_project = eden
shipit_fbcode_builder = true
[git]
repo_url = https://github.com/facebookexperimental/eden.git
[build.os=linux]
builder = cargo
[build.not(os=linux)]
# building Mononoke on windows is not supported
builder = nop
[cargo]
build_doc = true
workspace_dir = eden/mononoke
[shipit.pathmap]
fbcode/configerator/structs/scm/mononoke/public_autocargo = eden/mononoke/config_structs
fbcode/configerator/structs/scm/mononoke = eden/mononoke/config_structs
fbcode/eden/oss = .
fbcode/eden = eden
fbcode/eden/mononoke/public_autocargo = eden/mononoke
fbcode/tools/lfs = tools/lfs
tools/rust/ossconfigs = .
[shipit.strip]
# strip all code unrelated to mononoke to prevent triggering unnecessary checks
^fbcode/eden/(?!mononoke|scm/lib/xdiff.*)/.*$
^fbcode/eden/mononoke/(?!public_autocargo).+/Cargo\.toml$
^fbcode/configerator/structs/scm/mononoke/(?!public_autocargo).+/Cargo\.toml$
[dependencies]
fbthrift-rust
rust-shed
[dependencies.fb=on]
rust