diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 95105c585e..05469f3fe2 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -703,33 +703,53 @@ tasks: - "--apple_platform_type=ios" test_targets: - "//..." + bzlmod_all_crate_deps: + name: Cargo dependencies with bzlmod + platform: ubuntu2204 + working_directory: examples/all_crate_deps + build_targets: + - "//..." + bzlmod_all_deps_vendor: + name: Vendored dependencies with bzlmod + platform: ubuntu2204 + working_directory: examples/all_deps_vendor + run_targets: + - "//basic/3rdparty:crates_vendor" + build_targets: + - "//..." + bzlmod_compile_opt: + name: Compiler optimization with bzlmod + platform: ubuntu2204 + working_directory: examples/compile_opt + build_targets: + - "//..." # TODO: https://github.com/bazelbuild/rules_rust/issues/2075 - # zig_cross_compiling: - # name: Zig cross compiling test + # cross_compile_zig: + # name: Cross compile example with Zig # platform: ubuntu2204 - # working_directory: examples/zig_cross_compiling + # working_directory: examples/cross_compile_zig # build_targets: # - "//..." - musl_cross_compiling_macos_to_linux: - name: Musl cross compiling test from macOS to Linux + cross_compile_musl_macos_to_linux: + name: Cross compile example Musl from macOS to Linux platform: macos_arm64 - working_directory: examples/musl_cross_compiling + working_directory: examples/cross_compile_musl build_targets: - "//..." test_targets: - "//..." - musl_cross_compiling_linux_to_linux: - name: Musl cross compiling test from Linux to Linux + cross_compile_musl_linux_to_linux: + name: Cross compile example Musl from Linux to Linux platform: ubuntu2204 - working_directory: examples/musl_cross_compiling + working_directory: examples/cross_compile_musl build_targets: - "//..." test_targets: - "//..." - nix_cross_compiling: - name: Nix cross compiling test + cross_compile_nix: + name: Cross compile example with Nix platform: ubuntu2204 - working_directory: examples/nix_cross_compiling + working_directory: examples/cross_compile_nix setup: - curl -L https://nixos.org/nix/install | bash - sudo cp ~/.nix-profile/bin/nix* /usr/local/bin/ @@ -739,38 +759,18 @@ tasks: - "//:nix_cross_compiling" test_targets: - "//..." - bzlmod_all_crate_deps: - name: Cargo dependencies with bzlmod - platform: ubuntu2204 - working_directory: examples/all_crate_deps - build_targets: - - "//..." - bzlmod_all_deps_vendor: - name: Vendored dependencies with bzlmod - platform: ubuntu2204 - working_directory: examples/all_deps_vendor - run_targets: - - "//basic/3rdparty:crates_vendor" - build_targets: - - "//..." - bzlmod_compile_opt: - name: Compiler optimization with bzlmod - platform: ubuntu2204 - working_directory: examples/compile_opt - build_targets: - - "//..." - bzlmod_cross_compile: - name: Cross compilation with bzlmod + cross_compile_llvm_linux: + name: Cross compile example with LLVM on Linux platform: ubuntu2204 - working_directory: examples/cross_compile + working_directory: examples/cross_compile_llvm build_targets: - "//:all" test_targets: - "//..." - macos_bzlmod_cross_compile: - name: Cross compilation with bzlmod on macOS + cross_compile_llvm_macos: + name: Cross compile example with LLVM on MacOS platform: macos_arm64 - working_directory: examples/cross_compile + working_directory: examples/cross_compile_llvm build_targets: - "//:all" test_targets: diff --git a/crate_universe/src/metadata/cargo_tree_resolver.rs b/crate_universe/src/metadata/cargo_tree_resolver.rs index 0dfb6a62d3..e4f571e292 100644 --- a/crate_universe/src/metadata/cargo_tree_resolver.rs +++ b/crate_universe/src/metadata/cargo_tree_resolver.rs @@ -490,7 +490,7 @@ impl TreeResolver { // it means we are forced to resolve the dependencies and features for those proc-macros on all platforms we care about, // even if they wouldn't be used in some platform when cfg == exec. // - // This is tested by the "keyring" example in examples/musl_cross_compiling - the keyring crate uses proc-macros only on Linux, + // This is tested by the "keyring" example in examples/cross_compile_musl - the keyring crate uses proc-macros only on Linux, // and if we don't have this fake root injection, cross-compiling from Darwin to Linux won't work because features don't get correctly resolved for the exec=darwin case. fn copy_project_with_explicit_deps_on_all_transitive_proc_macros( &self, diff --git a/examples/cross_compile/.bazelrc b/examples/cross_compile_llvm/.bazelrc similarity index 100% rename from examples/cross_compile/.bazelrc rename to examples/cross_compile_llvm/.bazelrc diff --git a/examples/cross_compile/.gitignore b/examples/cross_compile_llvm/.gitignore similarity index 100% rename from examples/cross_compile/.gitignore rename to examples/cross_compile_llvm/.gitignore diff --git a/examples/cross_compile/BUILD.bazel b/examples/cross_compile_llvm/BUILD.bazel similarity index 100% rename from examples/cross_compile/BUILD.bazel rename to examples/cross_compile_llvm/BUILD.bazel diff --git a/examples/cross_compile/MODULE.bazel b/examples/cross_compile_llvm/MODULE.bazel similarity index 98% rename from examples/cross_compile/MODULE.bazel rename to examples/cross_compile_llvm/MODULE.bazel index 7a93af0735..cadf3f48f0 100644 --- a/examples/cross_compile/MODULE.bazel +++ b/examples/cross_compile_llvm/MODULE.bazel @@ -1,5 +1,5 @@ module( - name = "hello_cross", + name = "cross_compile_llvm_example", version = "0.0.0", ) diff --git a/examples/cross_compile/README.md b/examples/cross_compile_llvm/README.md similarity index 100% rename from examples/cross_compile/README.md rename to examples/cross_compile_llvm/README.md diff --git a/examples/cross_compile/README_LLVM_Troubleshooting.md b/examples/cross_compile_llvm/README_LLVM_Troubleshooting.md similarity index 100% rename from examples/cross_compile/README_LLVM_Troubleshooting.md rename to examples/cross_compile_llvm/README_LLVM_Troubleshooting.md diff --git a/examples/cross_compile/WORKSPACE.bazel b/examples/cross_compile_llvm/WORKSPACE.bazel similarity index 100% rename from examples/cross_compile/WORKSPACE.bazel rename to examples/cross_compile_llvm/WORKSPACE.bazel diff --git a/examples/cross_compile/WORKSPACE.bzlmod b/examples/cross_compile_llvm/WORKSPACE.bzlmod similarity index 100% rename from examples/cross_compile/WORKSPACE.bzlmod rename to examples/cross_compile_llvm/WORKSPACE.bzlmod diff --git a/examples/cross_compile/build/platforms/BUILD.bazel b/examples/cross_compile_llvm/build/platforms/BUILD.bazel similarity index 100% rename from examples/cross_compile/build/platforms/BUILD.bazel rename to examples/cross_compile_llvm/build/platforms/BUILD.bazel diff --git a/examples/cross_compile/build/sysroot/BUILD.bazel b/examples/cross_compile_llvm/build/sysroot/BUILD.bazel similarity index 100% rename from examples/cross_compile/build/sysroot/BUILD.bazel rename to examples/cross_compile_llvm/build/sysroot/BUILD.bazel diff --git a/examples/cross_compile/src/main.rs b/examples/cross_compile_llvm/src/main.rs similarity index 100% rename from examples/cross_compile/src/main.rs rename to examples/cross_compile_llvm/src/main.rs diff --git a/examples/cross_compile/test_hello_world.sh b/examples/cross_compile_llvm/test_hello_world.sh similarity index 100% rename from examples/cross_compile/test_hello_world.sh rename to examples/cross_compile_llvm/test_hello_world.sh diff --git a/examples/cross_compile/test_platform.sh b/examples/cross_compile_llvm/test_platform.sh similarity index 100% rename from examples/cross_compile/test_platform.sh rename to examples/cross_compile_llvm/test_platform.sh diff --git a/examples/musl_cross_compiling/.bazelrc b/examples/cross_compile_musl/.bazelrc similarity index 100% rename from examples/musl_cross_compiling/.bazelrc rename to examples/cross_compile_musl/.bazelrc diff --git a/examples/musl_cross_compiling/.gitignore b/examples/cross_compile_musl/.gitignore similarity index 100% rename from examples/musl_cross_compiling/.gitignore rename to examples/cross_compile_musl/.gitignore diff --git a/examples/musl_cross_compiling/BUILD.bazel b/examples/cross_compile_musl/BUILD.bazel similarity index 100% rename from examples/musl_cross_compiling/BUILD.bazel rename to examples/cross_compile_musl/BUILD.bazel diff --git a/examples/musl_cross_compiling/Cargo.Bazel.lock b/examples/cross_compile_musl/Cargo.Bazel.lock similarity index 100% rename from examples/musl_cross_compiling/Cargo.Bazel.lock rename to examples/cross_compile_musl/Cargo.Bazel.lock diff --git a/examples/musl_cross_compiling/Cargo.Bazel.lock.json b/examples/cross_compile_musl/Cargo.Bazel.lock.json similarity index 100% rename from examples/musl_cross_compiling/Cargo.Bazel.lock.json rename to examples/cross_compile_musl/Cargo.Bazel.lock.json diff --git a/examples/musl_cross_compiling/Cargo.toml b/examples/cross_compile_musl/Cargo.toml similarity index 100% rename from examples/musl_cross_compiling/Cargo.toml rename to examples/cross_compile_musl/Cargo.toml diff --git a/examples/musl_cross_compiling/MODULE.bazel b/examples/cross_compile_musl/MODULE.bazel similarity index 98% rename from examples/musl_cross_compiling/MODULE.bazel rename to examples/cross_compile_musl/MODULE.bazel index 3788cee6f0..d903da134c 100644 --- a/examples/musl_cross_compiling/MODULE.bazel +++ b/examples/cross_compile_musl/MODULE.bazel @@ -1,5 +1,5 @@ module( - name = "musl_cross_compiling_example", + name = "cross_compile_musl_example", version = "0.0.0", ) diff --git a/examples/musl_cross_compiling/WORKSPACE.bazel b/examples/cross_compile_musl/WORKSPACE.bazel similarity index 100% rename from examples/musl_cross_compiling/WORKSPACE.bazel rename to examples/cross_compile_musl/WORKSPACE.bazel diff --git a/examples/musl_cross_compiling/hello_linux_musl_test.sh b/examples/cross_compile_musl/hello_linux_musl_test.sh similarity index 100% rename from examples/musl_cross_compiling/hello_linux_musl_test.sh rename to examples/cross_compile_musl/hello_linux_musl_test.sh diff --git a/examples/musl_cross_compiling/linker_config/BUILD.bazel b/examples/cross_compile_musl/linker_config/BUILD.bazel similarity index 100% rename from examples/musl_cross_compiling/linker_config/BUILD.bazel rename to examples/cross_compile_musl/linker_config/BUILD.bazel diff --git a/examples/musl_cross_compiling/local_proc_macro/Cargo.toml b/examples/cross_compile_musl/local_proc_macro/Cargo.toml similarity index 100% rename from examples/musl_cross_compiling/local_proc_macro/Cargo.toml rename to examples/cross_compile_musl/local_proc_macro/Cargo.toml diff --git a/examples/musl_cross_compiling/local_proc_macro/src/lib.rs b/examples/cross_compile_musl/local_proc_macro/src/lib.rs similarity index 100% rename from examples/musl_cross_compiling/local_proc_macro/src/lib.rs rename to examples/cross_compile_musl/local_proc_macro/src/lib.rs diff --git a/examples/musl_cross_compiling/musl_utils.bzl b/examples/cross_compile_musl/musl_utils.bzl similarity index 100% rename from examples/musl_cross_compiling/musl_utils.bzl rename to examples/cross_compile_musl/musl_utils.bzl diff --git a/examples/musl_cross_compiling/platforms/BUILD.bazel b/examples/cross_compile_musl/platforms/BUILD.bazel similarity index 100% rename from examples/musl_cross_compiling/platforms/BUILD.bazel rename to examples/cross_compile_musl/platforms/BUILD.bazel diff --git a/examples/musl_cross_compiling/src/keyring.rs b/examples/cross_compile_musl/src/keyring.rs similarity index 100% rename from examples/musl_cross_compiling/src/keyring.rs rename to examples/cross_compile_musl/src/keyring.rs diff --git a/examples/musl_cross_compiling/src/main.rs b/examples/cross_compile_musl/src/main.rs similarity index 100% rename from examples/musl_cross_compiling/src/main.rs rename to examples/cross_compile_musl/src/main.rs diff --git a/examples/nix_cross_compiling/.bazelrc b/examples/cross_compile_nix/.bazelrc similarity index 100% rename from examples/nix_cross_compiling/.bazelrc rename to examples/cross_compile_nix/.bazelrc diff --git a/examples/nix_cross_compiling/.gitignore b/examples/cross_compile_nix/.gitignore similarity index 100% rename from examples/nix_cross_compiling/.gitignore rename to examples/cross_compile_nix/.gitignore diff --git a/examples/nix_cross_compiling/BUILD.bazel b/examples/cross_compile_nix/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/BUILD.bazel rename to examples/cross_compile_nix/BUILD.bazel diff --git a/examples/nix_cross_compiling/MODULE.bazel b/examples/cross_compile_nix/MODULE.bazel similarity index 99% rename from examples/nix_cross_compiling/MODULE.bazel rename to examples/cross_compile_nix/MODULE.bazel index 26efb6f8a0..90593abf6c 100644 --- a/examples/nix_cross_compiling/MODULE.bazel +++ b/examples/cross_compile_nix/MODULE.bazel @@ -1,5 +1,5 @@ module( - name = "rules_rust_examples_nix", + name = "cross_compile_nix_example", version = "0.0.0", ) diff --git a/examples/nix_cross_compiling/README.md b/examples/cross_compile_nix/README.md similarity index 100% rename from examples/nix_cross_compiling/README.md rename to examples/cross_compile_nix/README.md diff --git a/examples/nix_cross_compiling/WORKSPACE.bazel b/examples/cross_compile_nix/WORKSPACE.bazel similarity index 100% rename from examples/nix_cross_compiling/WORKSPACE.bazel rename to examples/cross_compile_nix/WORKSPACE.bazel diff --git a/examples/nix_cross_compiling/bazel/BUILD.bazel b/examples/cross_compile_nix/bazel/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/BUILD.bazel rename to examples/cross_compile_nix/bazel/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/cargo/BUILD.bazel b/examples/cross_compile_nix/bazel/cargo/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/cargo/BUILD.bazel rename to examples/cross_compile_nix/bazel/cargo/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/cargo/Cargo.lock b/examples/cross_compile_nix/bazel/cargo/Cargo.lock similarity index 100% rename from examples/nix_cross_compiling/bazel/cargo/Cargo.lock rename to examples/cross_compile_nix/bazel/cargo/Cargo.lock diff --git a/examples/nix_cross_compiling/bazel/cargo/cargo-bazel-lock.json b/examples/cross_compile_nix/bazel/cargo/cargo-bazel-lock.json similarity index 99% rename from examples/nix_cross_compiling/bazel/cargo/cargo-bazel-lock.json rename to examples/cross_compile_nix/bazel/cargo/cargo-bazel-lock.json index e3af15eb04..7ff155fa46 100644 --- a/examples/nix_cross_compiling/bazel/cargo/cargo-bazel-lock.json +++ b/examples/cross_compile_nix/bazel/cargo/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "9fa5a6d2b6da11f9fa70f3e77b6ce95a7335da408dc9348a37d2705373c1e805", + "checksum": "308729dc247ef9a6c8e4da2bee1b4f66124c2fa31d046af09759a0695a5b8e71", "crates": { "addr2line 0.21.0": { "name": "addr2line", diff --git a/examples/nix_cross_compiling/bazel/cargo/crates_repository.bzl b/examples/cross_compile_nix/bazel/cargo/crates_repository.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/cargo/crates_repository.bzl rename to examples/cross_compile_nix/bazel/cargo/crates_repository.bzl diff --git a/examples/nix_cross_compiling/bazel/nix_repositories.bzl b/examples/cross_compile_nix/bazel/nix_repositories.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/nix_repositories.bzl rename to examples/cross_compile_nix/bazel/nix_repositories.bzl diff --git a/examples/nix_cross_compiling/bazel/platforms/BUILD.bazel b/examples/cross_compile_nix/bazel/platforms/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/platforms/BUILD.bazel rename to examples/cross_compile_nix/bazel/platforms/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchain_rules/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchain_rules/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/clang.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/clang.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/clang.bzl rename to examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/clang.bzl diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/ld.lld.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/ld.lld.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/ld.lld.bzl rename to examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/ld.lld.bzl diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/ld64.lld.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/ld64.lld.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/ld64.lld.bzl rename to examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/ld64.lld.bzl diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/lld_link.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/lld_link.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/lld_link.bzl rename to examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/lld_link.bzl diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/llvm_ar.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/llvm_ar.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/llvm_ar.bzl rename to examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/llvm_ar.bzl diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/llvm_strip.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/llvm_strip.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/llvm_strip.bzl rename to examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/llvm_strip.bzl diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/wasm_ld.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/wasm_ld.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/cc_tools/wasm_ld.bzl rename to examples/cross_compile_nix/bazel/toolchain_rules/cc_tools/wasm_ld.bzl diff --git a/examples/nix_cross_compiling/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl rename to examples/cross_compile_nix/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/aarch64-apple-darwin/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/aarch64-apple-darwin/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/aarch64-apple-darwin/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/aarch64-apple-darwin/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/aarch64-apple-ios/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/aarch64-apple-ios/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/aarch64-apple-ios/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/aarch64-apple-ios/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/aarch64-linux-android/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/aarch64-linux-android/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/aarch64-linux-android/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/aarch64-linux-android/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/aarch64-unknown-linux-gnu/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/aarch64-unknown-linux-gnu/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/aarch64-unknown-linux-gnu/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/aarch64-unknown-linux-gnu/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/wasm32-unknown-unknown/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/wasm32-unknown-unknown/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/wasm32-unknown-unknown/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/wasm32-unknown-unknown/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/wasm32-wasip1/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/wasm32-wasip1/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/wasm32-wasip1/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/wasm32-wasip1/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/x86_64-apple-darwin/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/x86_64-apple-darwin/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/x86_64-apple-darwin/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/x86_64-apple-darwin/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/x86_64-pc-windows-msvc/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/x86_64-pc-windows-msvc/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/x86_64-pc-windows-msvc/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/x86_64-pc-windows-msvc/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/x86_64-unknown-linux-gnu/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/x86_64-unknown-linux-gnu/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/x86_64-unknown-linux-gnu/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/x86_64-unknown-linux-gnu/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/cc/x86_64-unknown-nixos-gnu/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/cc/x86_64-unknown-nixos-gnu/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/cc/x86_64-unknown-nixos-gnu/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/cc/x86_64-unknown-nixos-gnu/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/aarch64-apple-darwin/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/aarch64-apple-darwin/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/aarch64-apple-darwin/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/aarch64-apple-darwin/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/aarch64-apple-ios/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/aarch64-apple-ios/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/aarch64-apple-ios/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/aarch64-apple-ios/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/aarch64-linux-android/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/aarch64-linux-android/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/aarch64-linux-android/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/aarch64-linux-android/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/aarch64-unknown-linux-gnu/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/aarch64-unknown-linux-gnu/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/aarch64-unknown-linux-gnu/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/aarch64-unknown-linux-gnu/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/wasm32-unknown-unknown/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/wasm32-unknown-unknown/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/wasm32-unknown-unknown/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/wasm32-unknown-unknown/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/wasm32-wasip1/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/wasm32-wasip1/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/wasm32-wasip1/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/wasm32-wasip1/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/x86_64-apple-darwin/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/x86_64-apple-darwin/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/x86_64-apple-darwin/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/x86_64-apple-darwin/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/x86_64-pc-windows-msvc/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/x86_64-pc-windows-msvc/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/x86_64-pc-windows-msvc/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/x86_64-pc-windows-msvc/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/x86_64-unknown-linux-gnu/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/x86_64-unknown-linux-gnu/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/x86_64-unknown-linux-gnu/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/x86_64-unknown-linux-gnu/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/toolchains/rust/x86_64-unknown-nixos-gnu/BUILD.bazel b/examples/cross_compile_nix/bazel/toolchains/rust/x86_64-unknown-nixos-gnu/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/bazel/toolchains/rust/x86_64-unknown-nixos-gnu/BUILD.bazel rename to examples/cross_compile_nix/bazel/toolchains/rust/x86_64-unknown-nixos-gnu/BUILD.bazel diff --git a/examples/nix_cross_compiling/bazel/transitions.bzl b/examples/cross_compile_nix/bazel/transitions.bzl similarity index 100% rename from examples/nix_cross_compiling/bazel/transitions.bzl rename to examples/cross_compile_nix/bazel/transitions.bzl diff --git a/examples/nix_cross_compiling/cc_binary/BUILD.bazel b/examples/cross_compile_nix/cc_binary/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/cc_binary/BUILD.bazel rename to examples/cross_compile_nix/cc_binary/BUILD.bazel diff --git a/examples/nix_cross_compiling/cc_binary/cc_binary.cc b/examples/cross_compile_nix/cc_binary/cc_binary.cc similarity index 100% rename from examples/nix_cross_compiling/cc_binary/cc_binary.cc rename to examples/cross_compile_nix/cc_binary/cc_binary.cc diff --git a/examples/nix_cross_compiling/cc_binary/cc_binary_wasm32-unknown-unknown.cc b/examples/cross_compile_nix/cc_binary/cc_binary_wasm32-unknown-unknown.cc similarity index 100% rename from examples/nix_cross_compiling/cc_binary/cc_binary_wasm32-unknown-unknown.cc rename to examples/cross_compile_nix/cc_binary/cc_binary_wasm32-unknown-unknown.cc diff --git a/examples/nix_cross_compiling/cc_library/BUILD.bazel b/examples/cross_compile_nix/cc_library/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/cc_library/BUILD.bazel rename to examples/cross_compile_nix/cc_library/BUILD.bazel diff --git a/examples/nix_cross_compiling/cc_library/cc_library.cc b/examples/cross_compile_nix/cc_library/cc_library.cc similarity index 100% rename from examples/nix_cross_compiling/cc_library/cc_library.cc rename to examples/cross_compile_nix/cc_library/cc_library.cc diff --git a/examples/nix_cross_compiling/nix/BUILD.bazel b/examples/cross_compile_nix/nix/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/nix/BUILD.bazel rename to examples/cross_compile_nix/nix/BUILD.bazel diff --git a/examples/nix_cross_compiling/nix/README.md b/examples/cross_compile_nix/nix/README.md similarity index 100% rename from examples/nix_cross_compiling/nix/README.md rename to examples/cross_compile_nix/nix/README.md diff --git a/examples/nix_cross_compiling/nix/flake.lock b/examples/cross_compile_nix/nix/flake.lock similarity index 100% rename from examples/nix_cross_compiling/nix/flake.lock rename to examples/cross_compile_nix/nix/flake.lock diff --git a/examples/nix_cross_compiling/nix/flake.nix b/examples/cross_compile_nix/nix/flake.nix similarity index 100% rename from examples/nix_cross_compiling/nix/flake.nix rename to examples/cross_compile_nix/nix/flake.nix diff --git a/examples/nix_cross_compiling/rust_binary/BUILD.bazel b/examples/cross_compile_nix/rust_binary/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/rust_binary/BUILD.bazel rename to examples/cross_compile_nix/rust_binary/BUILD.bazel diff --git a/examples/nix_cross_compiling/rust_binary/rust_binary.rs b/examples/cross_compile_nix/rust_binary/rust_binary.rs similarity index 100% rename from examples/nix_cross_compiling/rust_binary/rust_binary.rs rename to examples/cross_compile_nix/rust_binary/rust_binary.rs diff --git a/examples/nix_cross_compiling/rust_binary/rust_binary_wasm32-unknown-unknown.rs b/examples/cross_compile_nix/rust_binary/rust_binary_wasm32-unknown-unknown.rs similarity index 100% rename from examples/nix_cross_compiling/rust_binary/rust_binary_wasm32-unknown-unknown.rs rename to examples/cross_compile_nix/rust_binary/rust_binary_wasm32-unknown-unknown.rs diff --git a/examples/nix_cross_compiling/rust_binary/rust_binary_wasm32-wasi.rs b/examples/cross_compile_nix/rust_binary/rust_binary_wasm32-wasi.rs similarity index 100% rename from examples/nix_cross_compiling/rust_binary/rust_binary_wasm32-wasi.rs rename to examples/cross_compile_nix/rust_binary/rust_binary_wasm32-wasi.rs diff --git a/examples/nix_cross_compiling/rust_library/BUILD.bazel b/examples/cross_compile_nix/rust_library/BUILD.bazel similarity index 100% rename from examples/nix_cross_compiling/rust_library/BUILD.bazel rename to examples/cross_compile_nix/rust_library/BUILD.bazel diff --git a/examples/nix_cross_compiling/rust_library/rust_library.rs b/examples/cross_compile_nix/rust_library/rust_library.rs similarity index 100% rename from examples/nix_cross_compiling/rust_library/rust_library.rs rename to examples/cross_compile_nix/rust_library/rust_library.rs diff --git a/examples/zig_cross_compiling/.bazelrc b/examples/cross_compile_zig/.bazelrc similarity index 100% rename from examples/zig_cross_compiling/.bazelrc rename to examples/cross_compile_zig/.bazelrc diff --git a/examples/zig_cross_compiling/.gitignore b/examples/cross_compile_zig/.gitignore similarity index 100% rename from examples/zig_cross_compiling/.gitignore rename to examples/cross_compile_zig/.gitignore diff --git a/examples/zig_cross_compiling/BUILD.bazel b/examples/cross_compile_zig/BUILD.bazel similarity index 100% rename from examples/zig_cross_compiling/BUILD.bazel rename to examples/cross_compile_zig/BUILD.bazel diff --git a/examples/zig_cross_compiling/Cargo.lock b/examples/cross_compile_zig/Cargo.lock similarity index 100% rename from examples/zig_cross_compiling/Cargo.lock rename to examples/cross_compile_zig/Cargo.lock diff --git a/examples/zig_cross_compiling/WORKSPACE.bazel b/examples/cross_compile_zig/WORKSPACE.bazel similarity index 97% rename from examples/zig_cross_compiling/WORKSPACE.bazel rename to examples/cross_compile_zig/WORKSPACE.bazel index a426f11bcb..80814210d9 100644 --- a/examples/zig_cross_compiling/WORKSPACE.bazel +++ b/examples/cross_compile_zig/WORKSPACE.bazel @@ -1,3 +1,5 @@ +workspace(name = "cross_compile_zig_example") + load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") BAZEL_ZIG_CC_VERSION = "v0.9.2" diff --git a/examples/zig_cross_compiling/cargo-bazel-lock.json b/examples/cross_compile_zig/cargo-bazel-lock.json similarity index 100% rename from examples/zig_cross_compiling/cargo-bazel-lock.json rename to examples/cross_compile_zig/cargo-bazel-lock.json diff --git a/examples/zig_cross_compiling/src/check_merged_flags.rs b/examples/cross_compile_zig/src/check_merged_flags.rs similarity index 100% rename from examples/zig_cross_compiling/src/check_merged_flags.rs rename to examples/cross_compile_zig/src/check_merged_flags.rs diff --git a/examples/zig_cross_compiling/src/main.rs b/examples/cross_compile_zig/src/main.rs similarity index 100% rename from examples/zig_cross_compiling/src/main.rs rename to examples/cross_compile_zig/src/main.rs diff --git a/examples/zig_cross_compiling/zig_utils.bzl b/examples/cross_compile_zig/zig_utils.bzl similarity index 100% rename from examples/zig_cross_compiling/zig_utils.bzl rename to examples/cross_compile_zig/zig_utils.bzl diff --git a/util/repin_all.sh b/util/repin_all.sh index d5091fedc9..bee9d44282 100755 --- a/util/repin_all.sh +++ b/util/repin_all.sh @@ -21,10 +21,10 @@ for d in examples/crate_universe/vendor_*/; do (cd "${d}" && CARGO_BAZEL_REPIN=true bazel run :crates_vendor) done -for d in examples/crate_universe* examples/musl_cross_compiling test/integration/no_std +for d in examples/crate_universe* examples/cross_compile_musl test/integration/no_std do (cd "${d}" && CARGO_BAZEL_REPIN=true bazel query //... >/dev/null) done # `nix_cross_compiling` special cased as `//...` will invoke Nix. -(cd examples/nix_cross_compiling && CARGO_BAZEL_REPIN=true bazel query @crate_index//... >/dev/null) +(cd examples/cross_compile_nix && CARGO_BAZEL_REPIN=true bazel query @crate_index//... >/dev/null)