Merge branch 'main' into mergify/bp/main/pr-744

Signed-off-by: Ian Chen <ichen@openrobotics.org>

Author: iche033

BUILD.bazel

@@ -66,6 +66,9 @@ cc_library(
     copts = [
         "-Wno-deprecated-declarations",
     ],
+    defines = [
+        'GZ_TRANSPORT_DEFAULT_IMPLEMENTATION=\\"zeromq\\"',
+    ],
     features = [
         # Layering check fails for clang build due to no module exporting
         # `google/protobuf/stubs/common.h`. Unfortunately, the bazel target that
@@ -83,9 +86,6 @@ cc_library(
         "@libuuid",
         "@libzmq",
     ],
-    defines = [
-        'GZ_TRANSPORT_DEFAULT_IMPLEMENTATION=\\"zeromq\\"'
-    ],
 )
 
 cc_library(
@@ -173,5 +173,4 @@ buildifier_test(
     mode = "diff",
     no_sandbox = True,
     workspace = "//:MODULE.bazel",
-)
->>>>>>> fe5dfb7 (Bazel updates (#744))
+)