Skip to content

Commit 3038d68

Browse files
stepanchegfacebook-github-bot
authored andcommitted
Use workspace file to route gazebo dependency
Summary: Easier than oss-disable. This patten also allows importing gazebo/allocative into buck2 repo for github, because starlark for example when in github buck2 repo now refers to workspace definition gazebo (i.e. `buck2/Cargo.toml`), not to crates version of gazebo. Reviewed By: ndmitchell Differential Revision: D41058641 fbshipit-source-id: 4d6823997f02ff76ddd94136360fe13f57957ee2
1 parent 897aaba commit 3038d68

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ members = [
44
"starlark",
55
"starlark_derive",
66
]
7+
8+
[workspace.dependencies]
9+
gazebo = { version = "0.8.1" }

starlark/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ memoffset = "0.6.4"
3535
thiserror = "1.0.36"
3636
starlark_derive = { version = "0.9.0-pre", path = "../starlark_derive" }
3737
starlark_map = { version = "0.9.0-pre", path = "../starlark_map" }
38-
gazebo.version = "0.8.1"
39-
gazebo.features = ["str_pattern_extensions"]
40-
# @oss-disable: gazebo.path = "../../gazebo/gazebo"
38+
gazebo = { workspace = true, features = ["str_pattern_extensions"] }
4139
gazebo_lint.version = "0.1"
4240
gazebo_lint.optional = true
4341
# @oss-disable: gazebo_lint.path = "../../gazebo_lint/gazebo_lint"

starlark_derive/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ proc-macro = true
1414
[dependencies]
1515
proc-macro2 = "1.0"
1616
syn = { version = "1.0.96", features = ["full", "extra-traits", "visit"] }
17-
gazebo.version = "0.8.1"
18-
gazebo.features = ["str_pattern_extensions"]
19-
# @oss-disable: gazebo.path = "../../gazebo/gazebo"
17+
gazebo = { workspace = true, features = ["str_pattern_extensions"] }
2018
gazebo_lint.version = "0.1"
2119
gazebo_lint.optional = true
2220
# @oss-disable: gazebo_lint.path = "../../gazebo_lint/gazebo_lint"

starlark_map/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ authors = [
1111
]
1212

1313
[dependencies]
14-
gazebo.version = "0.8.1"
15-
gazebo.features = ["str_pattern_extensions"]
16-
# @oss-disable: gazebo.path = "../../gazebo/gazebo"
14+
gazebo = { workspace = true }
1715
gazebo_lint.version = "0.1"
1816
gazebo_lint.optional = true
1917
# @oss-disable: gazebo_lint.path = "../../gazebo_lint/gazebo_lint"

0 commit comments

Comments
 (0)