Skip to content

Commit e3a906a

Browse files
Alramechmeta-codesync[bot]
authored andcommitted
Add non -test targets for rpmbuilder/nupkgbuilder/fbpkgbuilder
Summary: This Diff: Temporarily duplicate the eden rpm/nupkg builder targets to the release name This is to facilitate the naming switchover from fb-eden-test(-windows) packages to fb-eden(-windows) packages in conveyor The followup diff removes the -test targets and will be landed after the migration is complete Reviewed By: quark-zju Differential Revision: D97167452 fbshipit-source-id: a27482c7106fc087669dd3cfd5dbb6e934db826b
1 parent 12c3a29 commit e3a906a

2 files changed

Lines changed: 58 additions & 1 deletion

File tree

eden/BUCK

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ buck_genrule(
2020
],
2121
)
2222

23-
# TODO: T246598314: Unify with rpm.builder in eden/fs
2423
fbpkg.builder(
2524
name = "scm.edenfs",
2625
architectures = [

eden/fs/BUCK

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,37 @@ cpp_library(
1414
],
1515
)
1616

17+
rpm.builder(
18+
name = "fb-eden",
19+
# We are setting up conveyor+slowroll after which we can much lower this
20+
# limit. A higher limit is required for now to avoid weekly breakages as in
21+
# S209761.
22+
autoclean_keep_versions = 200,
23+
buck_opts = rpm.buck_opts(
24+
config = {
25+
# split-dwarf is required for reduce binary size
26+
"fbcode.split-dwarf": "true",
27+
},
28+
),
29+
configurations = [
30+
rpm.configuration(
31+
arch = "x86_64",
32+
os = "linux",
33+
),
34+
rpm.configuration(
35+
arch = "aarch64",
36+
os = "linux",
37+
),
38+
rpm.configuration(
39+
arch = "noarch",
40+
os = "mac",
41+
repo = "darwin/any",
42+
),
43+
],
44+
features = make_rpm_features(),
45+
summary = "Source control aware virtual filesystem",
46+
)
47+
1748
# TODO(T75318904): clean up the old packages once conveyor+slowroll is in
1849
# place.
1950
rpm.builder(
@@ -47,6 +78,33 @@ rpm.builder(
4778
summary = "Source control aware virtual filesystem",
4879
)
4980

81+
nupkg.builder(
82+
name = "fb-eden-windows",
83+
compatible_with = [
84+
"ovr_config//os:windows",
85+
],
86+
oncall = "scm_client_infra",
87+
shims = [
88+
{
89+
nupkg.shim.source: "fbcode//eden/fs/cli_rs/edenfsctl:edenfsctl",
90+
nupkg.shim.name: "eden",
91+
},
92+
],
93+
summary = "Source control aware virtual filesystem",
94+
deps = [
95+
"fbcode//eden/fs/cli:edenfsctl",
96+
"fbcode//eden/fs/cli/trace:trace_stream",
97+
"fbcode//eden/fs/cli_rs/edenfsctl:edenfsctl",
98+
"fbcode//eden/fs/config/facebook:edenfs_config_manager",
99+
"fbcode//eden/fs/facebook:eden-fb303-collector",
100+
"fbcode//eden/fs/service:edenfs",
101+
"fbcode//eden/fs/service:edenfs[pdb]",
102+
# TODO: Figure out symbol package "//arvr/tools/translator:symbol_ents"
103+
# TODO: Set up install script to copy files to the appropriate locations
104+
],
105+
)
106+
107+
# TODO: Remove this once we have conveyor+slowroll in place.
50108
nupkg.builder(
51109
name = "fb-eden-test-windows",
52110
compatible_with = [

0 commit comments

Comments
 (0)