Skip to content

Commit

Permalink
remove generated thrift code and fix external CI (#26)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: facebookexperimental/rust-shed#26

Pull Request resolved: facebook/sapling#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
  • Loading branch information
ahornby authored and facebook-github-bot committed Feb 9, 2022
1 parent c1a82c3 commit 31d12ef
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
6 changes: 3 additions & 3 deletions build/fbcode_builder/manifests/eden
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/.*$

Expand Down
9 changes: 3 additions & 6 deletions build/fbcode_builder/manifests/eden_scm
Original file line number Diff line number Diff line change
Expand Up @@ -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/.*$
Expand All @@ -56,8 +55,6 @@ fbcode/fboss/common = common
[dependencies]
fb303
fbthrift
fb303-source
fbthrift-source
python
rust-shed

Expand Down

0 comments on commit 31d12ef

Please sign in to comment.