Skip to content

Commit cb59fea

Browse files
joseph5wumeta-codesync[bot]
authored andcommitted
Fix FBOSS OSS on-diff job fetching configerator/structs/neteng/fboss/thrift/common.thrift
Summary: Looking at the SimpleShipitTransformerFetcher code again: https://www.internalfb.com/code/fbsource/fbcode/opensource/fbcode_builder/getdeps/fetcher.py?lines=539-548 The fetcher uses os.walk() on each root. When the root is a file path (like fbcode/configerator/structs/neteng/fboss/thrift/common.thrift), os.walk() returns an empty iterator because it expects a directory, not a file. So the single-file pathmap entry doesn't work with the current implementation. Reviewed By: priyankw-meta, KevinYakar Differential Revision: D96778062 fbshipit-source-id: 85826a78eec373ebb95c77e2abe0090e55b2d82c
1 parent d1e0310 commit cb59fea

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

  • build/fbcode_builder/manifests

build/fbcode_builder/manifests/fboss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,16 @@ tabulate
4646
gcc12
4747
python-pyyaml
4848

49+
# ShipitPathMap always assume to use directory to fetch the source code.
50+
# If you need to sync the files to fboss github repo, please make changes in
51+
# configerator/source/opensource/shipit_config/facebook/fboss.cconf
4952
[shipit.pathmap]
5053
fbcode/fboss/github = .
5154
fbcode/fboss/common = common
5255
fbcode/fboss = fboss
53-
fbcode/configerator/structs/neteng/fboss/thrift/common.thrift = configerator/structs/neteng/fboss/thrift/common.thrift
56+
# NOTE: Although this directory has other thrift files might not be ready for
57+
# opensource, this pathmap should only be used internally `getdeps.py fetch`
58+
fbcode/configerator/structs/neteng/fboss/thrift = configerator/structs/neteng/fboss/thrift
5459

5560
[shipit.strip]
5661
^fbcode/fboss/github/docs/.*

0 commit comments

Comments
 (0)