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"]),

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

@@ -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)

cc/defs.bzl

@@ -136,30 +136,30 @@ def aarch64_sysroot():
     maybe(
         http_archive,
         name = "aarch64-sysroot",
-        sha256 = "4e4cbbed33e78602a5f038305514307a5bd9baa6f6330f433fa4dffb3e9e9ad1",
+        sha256 = "edb3599237a755287a3ca3c94bdd64eb7552b768e927a9d125473d0b846f91f4",
         build_file_content = """
 filegroup(
     name = "aarch64-sysroot",
     srcs = glob(["*/**"]),
     visibility = ["//visibility:public"],
 )
     """,
-        url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v3/debian_bullseye_aarch64_sysroot.tar.xz",
+        url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v4/debian_bullseye_aarch64_sysroot.tar.xz",
     )
 
 def x86_64_sysroot():
     maybe(
         http_archive,
         name = "x86_64-sysroot",
-        sha256 = "cfa444ecc4fcc858acc045e72403efd54dab734bdad4ddec30aad8826916a617",
+        sha256 = "4235d41632c677d0c71e8e3b40abcf2b67e991e6b66a08cdf9d1e54a54de8869",
         build_file_content = """
 filegroup(
     name = "x86_64-sysroot",
     srcs = glob(["*/**"]),
     visibility = ["//visibility:public"],
 )
     """,
-        url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v3/debian_bullseye_x86_64_sysroot.tar.xz",
+        url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v4/debian_bullseye_x86_64_sysroot.tar.xz",
     )
 
 def register_swift_cc_toolchains():

cc/repositories.bzl

@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load(":config.bzl", "config")
 
 filegroup(name = "empty")