Reorganized examples

Author: UebelAndre

examples/cross_compile/.bazelrc

@@ -5,35 +5,47 @@
 ## https://bazel.build/docs/best-practices#bazelrc-file
 ###############################################################################
 
-###############################################################################
-## Build configuration
-###############################################################################
+# https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
+common --enable_platform_specific_config
 
-# Don't create bazel-* symlinks in the WORKSPACE directory.
-# Instead, set a prefix and put it in .gitignore
-# build --symlink_prefix=target-bzl/
+# Enable the only currently supported report type
+# https://bazel.build/reference/command-line-reference#flag--combined_report
+coverage --combined_report=lcov
 
-###############################################################################
-## Test configuration
-###############################################################################
+# Avoid fully cached builds reporting no coverage and failing CI
+# https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
+coverage --experimental_fetch_all_coverage_outputs
 
-# Reduce test output to just error cases
-test --test_output=errors
-test --verbose_failures
+# Required for some of the tests
+# https://bazel.build/reference/command-line-reference#flag--experimental_cc_shared_library
+common --experimental_cc_shared_library
 
 ###############################################################################
-## Common configuration
+## Unique configuration groups
 ###############################################################################
 
-# Enable Bzlmod for every Bazel command
-common --enable_bzlmod
+# Enable use of the nightly toolchains.
+build:nightly --@rules_rust//rust/toolchain/channel=nightly
 
-# Disable the bzlmod lockfile, so we don't accidentally commit MODULE.bazel.lock
-common --lockfile_mode=off
+# Enable rustfmt for all targets in the workspace
+build:rustfmt --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
+build:rustfmt --output_groups=+rustfmt_checks
+
+# Enable clippy for all targets in the workspace
+build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
+build:clippy --output_groups=+clippy_checks
 
-# Write build outputs in a platform-specific directory;
-# avoid outputs being wiped and rewritten when switching between platforms.
-common --experimental_platform_in_output_dir
+# Enable unpretty for all targets in the workspace
+build:unpretty --aspects=@rules_rust//rust:defs.bzl%rust_unpretty_aspect
+build:unpretty --output_groups=+rust_unpretty
+
+# `unpretty` requires the nightly toolchain. See tracking issue:
+# https://github.com/rust-lang/rust/issues/43364
+build:unpretty --config=nightly
+
+###############################################################################
+## Incompatibility flags
+###############################################################################
 
 # https://github.com/bazelbuild/bazel/issues/8195
 build --incompatible_disallow_empty_glob=true
@@ -45,16 +57,14 @@ build --nolegacy_external_runfiles
 build --incompatible_autoload_externally=
 
 ###############################################################################
-## Rust configuration
+## Bzlmod
 ###############################################################################
 
-# Enable rustfmt for all targets in the workspace
-build:rustfmt --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
-build:rustfmt --output_groups=+rustfmt_checks
+# A configuration for disabling bzlmod.
+common:no-bzlmod --noenable_bzlmod --enable_workspace
 
-# Enable clippy for all targets in the workspace
-build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:clippy --output_groups=+clippy_checks
+# Disable the bzlmod lockfile, so we don't accidentally commit MODULE.bazel.lock
+common --lockfile_mode=off
 
 ###############################################################################
 ## Custom user flags

examples/cross_compile/.gitignore

@@ -1,4 +1,2 @@
 /bazel-*
-.DS_Store
-target-bzl
 user.bazelrc

examples/cross_compile/BUILD.bazel

@@ -1,90 +1,60 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@rules_rust//rust:defs.bzl", "rust_binary")
 load("@rules_shell//shell:sh_test.bzl", "sh_test")
-
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "all",
-    srcs = [
-        ":hello_world_aarch64",
-        ":hello_world_host",
-        ":hello_world_x86_64",
-    ],
-)
+load(":musl_utils.bzl", "platform_transition_binary")
 
 rust_binary(
-    name = "hello_world_host",
+    name = "hello",
     srcs = ["src/main.rs"],
-    deps = [
-        "@crates//:lz4-sys",
-        "@crates//:mimalloc",
-    ],
+    tags = ["manual"],
 )
 
-rust_binary(
-    name = "hello_world_x86_64",
-    srcs = ["src/main.rs"],
-    platform = "//build/platforms:linux-x86_64",
-    deps = [
-        "@crates//:lz4-sys",
-        "@crates//:mimalloc",
-    ],
+platform_transition_binary(
+    name = "hello_linux_x86_64_musl",
+    binary = ":hello",
+    platform = "//platforms:linux_x86_64_musl",
 )
 
-rust_binary(
-    name = "hello_world_aarch64",
-    srcs = ["src/main.rs"],
-    platform = "//build/platforms:linux-aarch64",
-    deps = [
-        "@crates//:lz4-sys",
-        "@crates//:mimalloc",
-    ],
-)
-
-# Test if the host binary works.
-# Note, we cannot test for platform since Bazel determines the host platform automatically
 sh_test(
-    name = "test_hello_world_host",
-    srcs = ["test_hello_world.sh"],
+    name = "hello_linux_x86_64_musl_test",
+    srcs = ["hello_linux_musl_test.sh"],
     args = [
-        "$(rlocationpath :hello_world_host)",
-    ],
-    data = [
-        ":hello_world_host",
-    ],
-    deps = [
-        "@bazel_tools//tools/bash/runfiles",
+        "$(rootpath :hello_linux_x86_64_musl)",
+        "'ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), static-pie linked'",
     ],
+    data = [":hello_linux_x86_64_musl"],
 )
 
-# Test the for x86_64 architecture
-sh_test(
-    name = "test_linux_x86_64",
-    srcs = ["test_platform.sh"],
-    args = [
-        "$(rootpath :hello_world_x86_64)",
-        "x86_64",
-    ],
-    data = [
-        ":hello_world_x86_64",
-    ],
-    deps = [
-        "@bazel_tools//tools/bash/runfiles",
-    ],
+platform_transition_binary(
+    name = "hello_linux_arm64_musl",
+    binary = ":hello",
+    platform = "//platforms:linux_arm64_musl",
 )
 
-# Test for ARM architecture
 sh_test(
-    name = "test_linux_arm64",
-    srcs = ["test_platform.sh"],
+    name = "hello_linux_arm64_musl_test",
+    srcs = ["hello_linux_musl_test.sh"],
     args = [
-        "$(rootpath :hello_world_aarch64)",
-        "aarch64",
-    ],
-    data = [
-        ":hello_world_aarch64",
-    ],
-    deps = [
-        "@bazel_tools//tools/bash/runfiles",
+        "$(rootpath :hello_linux_arm64_musl)",
+        "'ELF 64-bit LSB executable, ARM aarch64, version 1 (SYSV), statically linked'",
     ],
+    data = [":hello_linux_arm64_musl"],
+)
+
+rust_binary(
+    name = "keyring",
+    srcs = ["src/keyring.rs"],
+    tags = ["manual"],
+    deps = ["@cu//:keyring"],
+)
+
+platform_transition_binary(
+    name = "keyring_linux_x86_64_musl",
+    binary = ":keyring",
+    platform = "//platforms:linux_x86_64_musl",
+)
+
+build_test(
+    name = "keyring_linux_x86_64_musl_build_test",
+    targets = [":keyring_linux_x86_64_musl"],
 )