Merge remote-tracking branch 'origin/main' into martin4861/bazel-compiler-flags-with-tests

Author: martin4861

.bazelignore

@@ -0,0 +1 @@
+examples/

.github/workflows/ci.yaml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Run format
         run: |
-          bazel run //:buildifier
+          bazel run //tools/buildifier:buildifier
           git diff --exit-code
 
   example-small-world:
@@ -47,5 +47,6 @@ jobs:
 
       - name: Run format
         run: |
-          bazel run //:buildifier
+          cd examples/small_world
+          bazel run //tools/buildifier:buildifier
           git diff --exit-code

BUILD.bazel

@@ -1,5 +0,0 @@
-load("@buildifier_prebuilt//:rules.bzl", "buildifier")
-
-buildifier(
-    name = "buildifier",
-)

MODULE.bazel

@@ -10,16 +10,18 @@
 
 module(
     name = "rules_swiftnav",
-    version = "0.9.0",
+    version = "0.11.0",
     compatibility_level = 1,
 )
 
 # Core Bazel dependencies
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "rules_cc", version = "0.1.1")
-bazel_dep(name = "rules_pkg", version = "1.0.1")
-bazel_dep(name = "rules_oci", version = "1.0.0")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "rules_pkg", version = "1.1.0")
+bazel_dep(name = "rules_oci", version = "1.8.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
+bazel_dep(name = "rules_python", version = "1.6.3")
 
 # Register module extensions
 swift_cc_toolchain_ext = use_extension("@rules_swiftnav//cc:extensions.bzl", "swift_cc_toolchain_extension")
@@ -67,6 +69,6 @@ use_repo(yocto_generic_ext, "yocto_generic")
 # Register the buildifier toolchain
 bazel_dep(
     name = "buildifier_prebuilt",
-    version = "8.2.0.2",
+    version = "8.2.1",
     dev_dependency = True,
 )

MODULE.bazel.lock

@@ -10,6 +10,7 @@
 
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
+load("@rules_python//python:py_binary.bzl", "py_binary")
 
 exports_files(
     glob(["*.bzl"]),
@@ -30,15 +31,15 @@ config_setting(
 )
 
 bool_flag(
-  name = "strong_stack_protector",
-  build_setting_default = False,
-  visibility = ["//visibility:public"],
+    name = "strong_stack_protector",
+    build_setting_default = False,
+    visibility = ["//visibility:public"],
 )
 
 config_setting(
-  name = "_strong_stack_protector",
-  flag_values = {":strong_stack_protector": "true"},
-  visibility = ["//visibility:public"],
+    name = "_strong_stack_protector",
+    flag_values = {":strong_stack_protector": "true"},
+    visibility = ["//visibility:public"],
 )
 
 # Enable warnings in tests for deprecated declarations with --@rules_swiftnav//cc:tests_warn_deprecated_declarations=true
@@ -174,7 +175,6 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
-
 selects.config_setting_group(
     name = "enable_symbolizer_x86_64_linux",
     match_all = [
@@ -230,10 +230,10 @@ py_binary(
 )
 
 py_binary(
-  name = "checktags",
-  srcs = [
-    "checktags.py",
-  ],
-  args = [],
-  visibility = ["//visibility:public"],
+    name = "checktags",
+    srcs = [
+        "checktags.py",
+    ],
+    args = [],
+    visibility = ["//visibility:public"],
 )

cc/BUILD.bazel

@@ -132,5 +132,4 @@ cc_static_library = rule(
         ),
     },
     toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
-    incompatible_use_toolchain_transition = True,
 )

cc/cc_static_library.bzl

@@ -16,8 +16,8 @@ DependencyLevelInfo = provider(
     fields = {
         "level": "Dependency level (0=internal, 1=prod, 2=safe, None=no level)",
         "portable": "Whether the target is portable",
-        "label": "The target's label"
-    }
+        "label": "The target's label",
+    },
 )
 
 def _get_coding_level_from_tags(tags):
@@ -76,7 +76,7 @@ def _check_allowed_cc_deps_impl(target, ctx):
             return [DependencyLevelInfo(
                 level = None,
                 portable = current_portable,
-                label = label_str
+                label = label_str,
             )]
 
     # Check dependencies
@@ -104,7 +104,7 @@ def _check_allowed_cc_deps_impl(target, ctx):
                 target.label,
                 _level_to_str(current_level),
                 dep_info.label,
-                _level_to_str(dep_level)
+                _level_to_str(dep_level),
             )
             fail(error_msg)
 
@@ -113,30 +113,31 @@ def _check_allowed_cc_deps_impl(target, ctx):
             error_msg = ("ERROR: Target {} is marked as portable but depends on {} which is not portable. " +
                          "Portable targets can only depend on other portable targets.").format(
                 target.label,
-                dep_info.label
+                dep_info.label,
             )
             fail(error_msg)
 
     # Return provider for this target
     return [DependencyLevelInfo(
         level = current_level,
         portable = current_portable,
-        label = label_str
+        label = label_str,
     )]
 
 check_allowed_cc_deps = aspect(
     implementation = _check_allowed_cc_deps_impl,
     attr_aspects = ["deps"],
-    attrs = {}
+    attrs = {},
 )
 
 def _validate_allowed_deps_rule_impl(ctx):
     """Rule that applies the validation aspect to specified targets."""
+
     # This rule doesn't produce any output, it just triggers the aspect
     output = ctx.actions.declare_file(ctx.label.name + ".validation")
     ctx.actions.write(
         output = output,
-        content = "Allowed C/C++ dependency validation passed\n"
+        content = "Allowed C/C++ dependency validation passed\n",
     )
     return [DefaultInfo(files = depset([output]))]
 
@@ -145,10 +146,10 @@ validate_allowed_cc_deps = rule(
     attrs = {
         "targets": attr.label_list(
             aspects = [check_allowed_cc_deps],
-            doc = "Targets to validate"
-        )
+            doc = "Targets to validate",
+        ),
     },
-    doc = "Validates allowed C/C++ dependencies for specified targets"
+    doc = "Validates allowed C/C++ dependencies for specified targets",
 )
 
 def validate_all_allowed_cc_deps(name, targets = ["//..."]):
@@ -161,5 +162,5 @@ def validate_all_allowed_cc_deps(name, targets = ["//..."]):
     validate_allowed_cc_deps(
         name = name,
         targets = targets,
-        tags = ["manual"]  # Don't build by default, only when explicitly requested
+        tags = ["manual"],  # Don't build by default, only when explicitly requested
     )

cc/check_allowed_cc_deps.bzl

@@ -10,6 +10,7 @@
 
 """Swift wrappers for native cc rules."""
 
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load("//stamp:stamp_file.bzl", "stamp_file")
 load(":cc_static_library.bzl", _cc_static_library = "cc_static_library")
 load(":copts.bzl", "DEFAULT_COPTS", "GCC5_COPTS", "GCC6_COPTS")
@@ -246,7 +247,7 @@ def swift_c_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_cc_library(**kwargs):
     """Wraps cc_library to enforce standards for a production c++ library.
@@ -299,7 +300,7 @@ def swift_cc_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_c_tool_library(**kwargs):
     """Wraps cc_library to enforce standards for a non-production c library.
@@ -343,7 +344,7 @@ def swift_c_tool_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_cc_tool_library(**kwargs):
     """Wraps cc_library to enforce standards for a non-production c++ library.
@@ -390,7 +391,7 @@ def swift_cc_tool_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_c_binary(**kwargs):
     """Wraps cc_binary to enforce standards for a production c binary.
@@ -438,7 +439,7 @@ def swift_c_binary(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_binary(**kwargs)
+    cc_binary(**kwargs)
 
 def swift_cc_binary(**kwargs):
     """Wraps cc_binary to enforce standards for a production c++ binary.
@@ -488,7 +489,7 @@ def swift_cc_binary(**kwargs):
 
     kwargs["tags"] = [BINARY] + kwargs.get("tags", [])
 
-    native.cc_binary(**kwargs)
+    cc_binary(**kwargs)
 
 def swift_c_tool(**kwargs):
     """Wraps cc_binary to enforce standards for a non-production c binary.
@@ -531,7 +532,7 @@ def swift_c_tool(**kwargs):
 
     kwargs["env"] = _symbolizer_env(kwargs.get("env", {}))
 
-    native.cc_binary(**kwargs)
+    cc_binary(**kwargs)
 
 def swift_cc_tool(**kwargs):
     """Wraps cc_binary to enforce standards for a non-production c++ binary.
@@ -577,7 +578,7 @@ def swift_cc_tool(**kwargs):
 
     kwargs["env"] = _symbolizer_env(kwargs.get("env", {}))
 
-    native.cc_binary(**kwargs)
+    cc_binary(**kwargs)
 
 def swift_c_test_library(**kwargs):
     """Wraps cc_library to enforce Swift test library conventions.
@@ -604,7 +605,7 @@ def swift_c_test_library(**kwargs):
     kwargs["tags"] = [TEST_LIBRARY] + kwargs.get("tags", [])
     kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_cc_test_library(**kwargs):
     """Wraps cc_library to enforce Swift test library conventions.
@@ -635,7 +636,7 @@ def swift_cc_test_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_c_test(name, type, **kwargs):
     """Wraps cc_test to enforce Swift testing conventions for C code.
@@ -690,7 +691,7 @@ def swift_c_test(name, type, **kwargs):
     kwargs["tags"] = [TEST, type] + kwargs.get("tags", [])
     kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()
 
-    native.cc_test(**kwargs)
+    cc_test(**kwargs)
 
 def swift_cc_test(name, type, **kwargs):
     """Wraps cc_test to enforce Swift testing conventions.
@@ -742,4 +743,4 @@ def swift_cc_test(name, type, **kwargs):
     kwargs["tags"] = [TEST, type] + kwargs.get("tags", [])
     kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()
 
-    native.cc_test(**kwargs)
+    cc_test(**kwargs)