Skip to content

Commit f587e48

Browse files
Manual forward port of: Bazel updates (#562) (#565)
Few fixes in MODULE.bazel as pre-work to add automation to push new releases to BCR: - 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 45ab665 commit f587e48

File tree

3 files changed

+33
-10
lines changed

3 files changed

+33
-10
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: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
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")
15+
bazel_dep(name = "gz-common", version = "7.0.0")
16+
bazel_dep(name = "gz-math", version = "9.0.0")
17+
bazel_dep(name = "gz-msgs", version = "12.0.0")
18+
bazel_dep(name = "gz-rendering", version = "10.0.0")
19+
bazel_dep(name = "gz-transport", version = "15.0.0")
20+
bazel_dep(name = "gz-utils", version = "4.0.0")
21+
bazel_dep(name = "sdformat", version = "16.0.0")
2222

23+
# Override Gz deps to be pulled from the `main` branches so that CI uses deps
24+
# from HEAD on `main`.
2325
archive_override(
2426
module_name = "gz-common",
2527
strip_prefix = "gz-common-main",

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)