From 31d12efeef32a1fe58f628b2de8a9d1b4f80de4e Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Wed, 9 Feb 2022 12:20:17 -0800 Subject: [PATCH] remove generated thrift code and fix external CI (#26) Summary: Pull Request resolved: https://github.com/facebookexperimental/rust-shed/pull/26 Pull Request resolved: https://github.com/facebookexperimental/eden/pull/104 No need for the checked in generated code anymore Successful external CI Linux run on Git Hub PR: https://github.com/facebookexperimental/eden/runs/5130405984?check_suite_focus=true Mac PR run fails with a SSL cert issue, will look separately Reviewed By: chadaustin, mitrandir77 Differential Revision: D33840545 fbshipit-source-id: eafc2a0e2191d438fd828adeebc2e318d319025f --- build/fbcode_builder/manifests/eden | 6 +++--- build/fbcode_builder/manifests/eden_scm | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index a6498230ad..dfc3e8bb1d 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -60,7 +60,7 @@ fbcode/tools/lfs = tools/lfs [shipit.pathmap.fb=off] fbcode/eden/fs/public_autocargo = eden/fs -fbcode/eden/scm/lib/public_autocargo = eden/scm/lib +fbcode/eden/scm/public_autocargo = eden/scm fbcode/common/rust/shed/hostcaps/public_cargo = common/rust/shed/hostcaps fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/hg @@ -77,9 +77,9 @@ fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/h [shipit.strip.fb=off] ^fbcode/common/rust/shed(?!/public_autocargo).*/Cargo\.toml$ -^fbcode/configerator/structs/hg(?!/public_autocargo).*/Cargo\.toml$ +^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$ ^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$ -^fbcode/eden/scm/lib(?!/public_autocargo).*/Cargo\.toml$ +^fbcode/eden/scm(?!/public_autocargo|/edenscmnative).*/Cargo\.toml$ ^.*/facebook/.*$ ^.*/fb/.*$ diff --git a/build/fbcode_builder/manifests/eden_scm b/build/fbcode_builder/manifests/eden_scm index 79fea84e76..13eef42530 100644 --- a/build/fbcode_builder/manifests/eden_scm +++ b/build/fbcode_builder/manifests/eden_scm @@ -32,21 +32,20 @@ fbcode/eden/oss = . fbcode/eden = eden fbcode/eden/fs/public_autocargo = eden/fs fbcode/eden/mononoke/public_autocargo = eden/mononoke -fbcode/eden/scm/lib/public_autocargo = eden/scm/lib +fbcode/eden/scm/public_autocargo = eden/scm fbcode/tools/lfs = tools/lfs # This is to pick up the fb303.thrift stubs fbcode/fboss/common = common [shipit.strip] -^fbcode/configerator/structs/hg(?!/public_autocargo).*/Cargo\.toml$ +^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$ ^fbcode/eden/fs/eden-config\.h$ ^fbcode/eden/fs/py/eden/config\.py$ ^fbcode/eden/hg-server/.*$ ^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$ ^fbcode/eden/mononoke(?!/public_autocargo).*/Cargo\.toml$ -^fbcode/eden/scm/lib(?!/public_autocargo).*/Cargo\.toml$ +^fbcode/eden/scm(?!/public_autocargo|/edenscmnative).*/Cargo\.toml$ ^fbcode/eden/scm/build/.*$ -^fbcode/eden/scm/lib/third-party/rust/.*/Cargo.toml$ ^fbcode/eden/.*/\.cargo/.*$ ^.*/facebook/.*$ ^.*/fb/.*$ @@ -56,8 +55,6 @@ fbcode/fboss/common = common [dependencies] fb303 fbthrift -fb303-source -fbthrift-source python rust-shed