Skip to content

Commit 7447e11

Browse files
Manual backport of: Bazel updates: prep for BCR release automation (#562) (#566)
Few fixes in MODULE.bazel as pre-work to add automation to push new releases to BCR: - Remove archive_override for gazebo package deps and use Jetty packages from BCR instead. As a result, bazel CI will use released versions of gz deps, which is consistent with cmake CI. - Add compatibility_level to match what is set in BCR - Add builidifier linting for consistent formatting of bazel files. - Added docstring for gz_sensor_library.bzl - Bumped rules_cc to 0.2.14 as indicated in resolved bazel build graph Signed-off-by: Shameek Ganguly <shameek@intrinsic.ai>
1 parent 91171df commit 7447e11

File tree

3 files changed

+31
-58
lines changed

3 files changed

+31
-58
lines changed

BUILD.bazel

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@buildifier_prebuilt//:rules.bzl", "buildifier", "buildifier_test")
12
load("@rules_cc//cc:cc_library.bzl", "cc_library")
23
load("@rules_cc//cc:cc_test.bzl", "cc_test")
34
load("@rules_gazebo//gazebo:headers.bzl", "gz_configure_header", "gz_export_header", "gz_include_header")
@@ -611,3 +612,19 @@ cc_library(
611612
":wide_angle_camera",
612613
],
613614
)
615+
616+
buildifier(
617+
name = "buildifier.fix",
618+
exclude_patterns = ["./.git/*"],
619+
lint_mode = "fix",
620+
mode = "fix",
621+
)
622+
623+
buildifier_test(
624+
name = "buildifier.test",
625+
exclude_patterns = ["./.git/*"],
626+
lint_mode = "warn",
627+
mode = "diff",
628+
no_sandbox = True,
629+
workspace = "//:MODULE.bazel",
630+
)

MODULE.bazel

Lines changed: 10 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,21 @@
1-
## MODULE.bazel
21
module(
32
name = "gz-sensors",
4-
repo_name = "org_gazebosim_gz-sensors",
3+
compatibility_level = 9,
54
)
65

76
bazel_dep(name = "bazel_skylib", version = "1.7.1")
7+
bazel_dep(name = "buildifier_prebuilt", version = "8.2.1")
88
bazel_dep(name = "eigen", version = "3.4.0.bcr.3")
99
bazel_dep(name = "googletest", version = "1.15.2")
10+
bazel_dep(name = "rules_cc", version = "0.2.14")
1011
bazel_dep(name = "rules_license", version = "1.0.0")
1112

1213
# Gazebo Dependencies
13-
bazel_dep(name = "rules_cc", version = "0.1.1")
1414
bazel_dep(name = "rules_gazebo", version = "0.0.6")
15-
bazel_dep(name = "gz-common")
16-
bazel_dep(name = "gz-math")
17-
bazel_dep(name = "gz-msgs")
18-
bazel_dep(name = "gz-rendering")
19-
bazel_dep(name = "gz-transport")
20-
bazel_dep(name = "gz-utils")
21-
bazel_dep(name = "sdformat")
22-
23-
archive_override(
24-
module_name = "gz-common",
25-
strip_prefix = "gz-common-gz-common6",
26-
urls = ["https://github.com/gazebosim/gz-common/archive/refs/heads/gz-common6.tar.gz"],
27-
)
28-
29-
archive_override(
30-
module_name = "gz-math",
31-
strip_prefix = "gz-math-gz-math8",
32-
urls = ["https://github.com/gazebosim/gz-math/archive/refs/heads/gz-math8.tar.gz"],
33-
)
34-
35-
archive_override(
36-
module_name = "gz-msgs",
37-
strip_prefix = "gz-msgs-gz-msgs11",
38-
urls = ["https://github.com/gazebosim/gz-msgs/archive/refs/heads/gz-msgs11.tar.gz"],
39-
)
40-
41-
archive_override(
42-
module_name = "gz-rendering",
43-
strip_prefix = "gz-rendering-gz-rendering9",
44-
urls = ["https://github.com/gazebosim/gz-rendering/archive/refs/heads/gz-rendering9.tar.gz"],
45-
)
46-
47-
archive_override(
48-
module_name = "gz-plugin",
49-
strip_prefix = "gz-plugin-gz-plugin3",
50-
urls = ["https://github.com/gazebosim/gz-plugin/archive/refs/heads/gz-plugin3.tar.gz"],
51-
)
52-
53-
archive_override(
54-
module_name = "gz-transport",
55-
strip_prefix = "gz-transport-gz-transport14",
56-
urls = ["https://github.com/gazebosim/gz-transport/archive/refs/heads/gz-transport14.tar.gz"],
57-
)
58-
59-
archive_override(
60-
module_name = "gz-utils",
61-
strip_prefix = "gz-utils-gz-utils3",
62-
urls = ["https://github.com/gazebosim/gz-utils/archive/refs/heads/gz-utils3.tar.gz"],
63-
)
64-
65-
archive_override(
66-
module_name = "sdformat",
67-
strip_prefix = "sdformat-sdf15",
68-
urls = ["https://github.com/gazebosim/sdformat/archive/refs/heads/sdf15.tar.gz"],
69-
)
15+
bazel_dep(name = "gz-common", version = "6.2.1")
16+
bazel_dep(name = "gz-math", version = "8.1.1.bcr.1")
17+
bazel_dep(name = "gz-msgs", version = "11.1.0.bcr.2")
18+
bazel_dep(name = "gz-rendering", version = "9.4.0")
19+
bazel_dep(name = "gz-transport", version = "14.2.0.bcr.1")
20+
bazel_dep(name = "gz-utils", version = "3.1.1")
21+
bazel_dep(name = "sdformat", version = "15.3.0.bcr.2")

bazel/gz_sensor_library.bzl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
"""
2+
Rules for sensor libraries.
3+
"""
4+
15
load("@rules_cc//cc:cc_library.bzl", "cc_library")
26
load("@rules_gazebo//gazebo:headers.bzl", "gz_export_header")
37

0 commit comments

Comments
 (0)