Consolidate example packages (bazelbuild#3144)

closes bazelbuild#1839
havasd · Dec 31, 2024 · d3b890d · d3b890d
1 parent 37acfa1
commit d3b890d
Show file tree

Hide file tree

Showing 304 changed files with 2,940 additions and 3,863 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -63,6 +63,7 @@ crate_universe_vendor_example_targets: &crate_universe_vendor_example_targets
   - "//vendor_local_pkgs:crates_vendor"
   - "//vendor_remote_manifests:crates_vendor"
   - "//vendor_remote_pkgs:crates_vendor"
+  - "@rules_rust//tools/rust_analyzer:gen_rust_project"
 coverage_validation_post_shell_commands: &coverage_validation_post_shell_commands
   - |
     grep -q '^SF:.*\.rs$' bazel-out/_coverage/_coverage_report.dat \
@@ -409,94 +410,6 @@ tasks:
     run_targets:
       - "//tools/rust_analyzer:gen_rust_project"
       - "//test/rust_analyzer:rust_analyzer_test"
-  examples_rust_analyzer_integration_test:
-    name: Rust-Analyzer Integration Test
-    platform: ubuntu2004
-    working_directory: examples
-    run_targets:
-      - "@rules_rust//tools/rust_analyzer:gen_rust_project"
-  ubuntu2004_examples:
-    name: Examples
-    platform: ubuntu2004
-    working_directory: examples
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
-    build_flags: *aspects_flags
-  ubuntu2004_examples_clang:
-    name: Examples with Clang
-    platform: ubuntu2004
-    working_directory: examples
-    build_flags:
-      - "--repo_env=CC=clang"
-      - "--config=rustfmt"
-      - "--config=clippy"
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
-  # TODO: https://github.com/bazelbuild/rules_rust/issues/2554
-  # ubuntu2004_examples_clang_lld:
-  #   name: Examples with Clang and LLD
-  #   platform: ubuntu2004
-  #   shell_commands:
-  #     - "sudo apt -y update && sudo apt -y install lld"
-  #   working_directory: examples
-  #   build_flags:
-  #     - "--repo_env=CC=clang"
-  #     - "--linkopt=-fuse-ld=lld"
-  #     - "--config=rustfmt"
-  #     - "--config=clippy"
-  #   build_targets:
-  #     - "//..."
-  #   test_targets:
-  #     - "//..."
-  ubuntu2004_examples_rolling:
-    name: "Examples with Rolling Bazel Version"
-    platform: ubuntu2004
-    working_directory: examples
-    build_targets:
-      - "//..."
-    test_targets:
-      - "//..."
-    build_flags: *aspects_flags
-    soft_fail: yes
-  rbe_ubuntu2004_examples:
-    name: Examples
-    platform: rbe_ubuntu2004
-    working_directory: examples
-    rbe_examples_targets: &rbe_examples_targets
-      - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
-      - "//..."
-    shell_commands:
-      - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
-      - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
-    build_targets: *rbe_examples_targets
-    test_targets: *rbe_examples_targets
-    build_flags: *aspects_flags
-  macos_examples:
-    name: Examples
-    platform: macos_arm64
-    working_directory: examples
-    build_targets:
-      - "//..."
-    test_targets:
-      - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
-      - "//..."
-    build_flags: *aspects_flags
-  windows_examples:
-    name: Examples
-    platform: windows
-    working_directory: examples
-    build_flags:
-      - "--config=rustfmt"
-      - "--config=clippy"
-    windows_targets: &windows_targets
-      - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
-      - "//..."
-    build_targets: *windows_targets
-    test_targets: *windows_targets
   crate_universe_examples_ubuntu2004:
     name: Crate Universe Examples
     platform: ubuntu2004
@@ -713,42 +626,42 @@ tasks:
   bzlmod_all_crate_deps:
     name: Cargo dependencies with bzlmod
     platform: ubuntu2004
-    working_directory: examples/bzlmod/all_crate_deps
+    working_directory: examples/all_crate_deps
     build_targets:
       - "//..."
   bzlmod_all_deps_vendor:
     name: Vendored dependencies with bzlmod
     platform: ubuntu2004
-    working_directory: examples/bzlmod/all_deps_vendor
+    working_directory: examples/all_deps_vendor
     run_targets:
       - "//basic/3rdparty:crates_vendor"
     build_targets:
       - "//..."
   bzlmod_compile_opt:
     name: Compiler optimization with bzlmod
     platform: ubuntu2004
-    working_directory: examples/bzlmod/compile_opt
+    working_directory: examples/compile_opt
     build_targets:
       - "//..."
   bzlmod_cross_compile:
     name: Cross compilation with bzlmod
     platform: ubuntu2004
-    working_directory: examples/bzlmod/cross_compile
+    working_directory: examples/cross_compile
     build_targets:
       - "//:all"
     test_targets:
       - "//..."
   macos_bzlmod_cross_compile:
     name: Cross compilation with bzlmod on macOS
     platform: macos_arm64
-    working_directory: examples/bzlmod/cross_compile
+    working_directory: examples/cross_compile
     build_targets:
       - "//:all"
     test_targets:
       - "//..."
   example_ffi_linux:
     platform: ubuntu2004
-    working_directory: examples/bzlmod/ffi
+    working_directory: examples/ffi
     name: FFI Example
     build_targets:
       - "//..."
@@ -757,23 +670,23 @@ tasks:
   # TODO: https://github.com/bazelbuild/bazel/issues/9987
   # example_ffi_linux_rbe:
   #   platform: rbe_ubuntu2004
-  #   working_directory: examples/bzlmod/ffi
+  #   working_directory: examples/ffi
   #   name: FFI Example
   #   build_targets:
   #     - "//..."
   #   test_targets:
   #     - "//..."
   example_ffi_macos:
     platform: macos_arm64
-    working_directory: examples/bzlmod/ffi
+    working_directory: examples/ffi
     name: FFI Example
     build_targets:
       - "//..."
     test_targets:
       - "//..."
   example_ffi_windows:
     platform: windows
-    working_directory: examples/bzlmod/ffi
+    working_directory: examples/ffi
     name: FFI Example
     build_targets:
       - "//..."
@@ -782,7 +695,7 @@ tasks:
   ubuntu2004_bzlmod_bcr:
     name: bzlmod BCR presubmit
     platform: ubuntu2004
-    working_directory: examples/bzlmod/hello_world
+    working_directory: examples/hello_world
     test_flags: *bzlmod_flags
     run_targets:
       - "//third-party-in-workspace:vendor"
@@ -793,7 +706,7 @@ tasks:
     name: bzlmod BCR presubmit minimal bazel
     bazel: *minimum_bazel_version
     platform: ubuntu2004
-    working_directory: examples/bzlmod/hello_world
+    working_directory: examples/hello_world
     shell_commands:
       - "rm MODULE.bazel.lock"
     run_targets:
@@ -804,7 +717,7 @@ tasks:
   macos_bzlmod_bcr:
     name: bzlmod BCR presubmit
     platform: macos_arm64
-    working_directory: examples/bzlmod/hello_world
+    working_directory: examples/hello_world
     test_flags: *bzlmod_flags
     run_targets:
       - "//third-party-in-workspace:vendor"
@@ -815,7 +728,7 @@ tasks:
   # windows_bzlmod_bcr:
   #   name: bzlmod BCR presubmit
   #   platform: windows
-  #   working_directory: examples/bzlmod/hello_world
+  #   working_directory: examples/hello_world
   #   test_flags: *bzlmod_flags
   #   run_targets:
   #     - "//third-party-in-workspace:vendor"
@@ -825,31 +738,31 @@ tasks:
   #     - "//..."
   example_sys_linux:
     platform: ubuntu2004
-    working_directory: examples/bzlmod/sys
+    working_directory: examples/sys
     name: Sys Example
     build_targets:
       - "//..."
     test_targets:
       - "//..."
   example_sys_linux_rbe:
     platform: ubuntu2004
-    working_directory: examples/bzlmod/sys
+    working_directory: examples/sys
     name: Sys Example
     build_targets:
       - "//..."
     test_targets:
       - "//..."
   example_sys_macos:
     platform: macos_arm64
-    working_directory: examples/bzlmod/sys
+    working_directory: examples/sys
     name: Sys Example
     build_targets:
       - "//..."
     test_targets:
       - "//..."
   example_sys_windows:
     platform: windows
-    working_directory: examples/bzlmod/sys
+    working_directory: examples/sys
     name: Sys Example
     build_targets:
       - "//..."
@@ -861,7 +774,7 @@ tasks:
     # --incompatible_use_plus_in_repo_names'
     bazel: *minimum_bazel_version
     platform: ubuntu2004
-    working_directory: examples/bzlmod/hello_world
+    working_directory: examples/hello_world
     test_flags: *bzlmod_plus_repo_names_flags
     run_targets:
       - "//third-party-in-workspace:vendor"
@@ -874,7 +787,7 @@ tasks:
     # --incompatible_use_plus_in_repo_names'
     bazel: *minimum_bazel_version
     platform: macos_arm64
-    working_directory: examples/bzlmod/hello_world
+    working_directory: examples/hello_world
     test_flags: *bzlmod_plus_repo_names_flags
     run_targets:
       - "//third-party-in-workspace:vendor"
@@ -887,7 +800,7 @@ tasks:
     # --incompatible_use_plus_in_repo_names'
     bazel: *minimum_bazel_version
     platform: windows
-    working_directory: examples/bzlmod/hello_world
+    working_directory: examples/hello_world
     test_flags: *bzlmod_plus_repo_names_flags
     run_targets:
       - "//third-party-in-workspace:vendor"
@@ -898,27 +811,27 @@ tasks:
   bzlmod_no_cargo:
     name: Cargo-less bzlmod
     platform: ubuntu2004
-    working_directory: examples/bzlmod/hello_world_no_cargo
+    working_directory: examples/hello_world_no_cargo
     build_targets:
       - "//..."
   bzlmod_override_targets:
     name: Override Targets bzlmod
     platform: ubuntu2004
-    working_directory: examples/bzlmod/override_target
+    working_directory: examples/override_target
     build_targets:
       - "//..."
     test_targets:
       - "//..."
   bzlmod_proto:
     name: Proto and Prost with bzlmod
     platform: ubuntu2004
-    working_directory: examples/bzlmod/proto
+    working_directory: examples/proto
     build_targets:
       - "//..."
   bzlmod_protoc:
     name: Proto and Prost with prebuilt protoc with bzlmod
     platform: ubuntu2004
-    working_directory: examples/bzlmod/proto_with_toolchain
+    working_directory: examples/proto_with_toolchain
     build_targets:
       - "//..."
   compile_one_dependency:

diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
@@ -5,7 +5,7 @@ bcr_test_module:
     bazel: ["7.x"]
   tasks:
     run_tests:
-      working_directory: examples/bzlmod/hello_world
+      working_directory: examples/hello_world
       name: "Run test module"
       platform: ${{ platform }}
       bazel: ${{ bazel }}
@@ -24,7 +24,7 @@ bcr_test_module_windows:
     bazel: ["7.x"]
   tasks:
     run_tests:
-      working_directory: examples/bzlmod/hello_world
+      working_directory: examples/hello_world
       name: "Run test module"
       platform: windows
       bazel: ${{ bazel }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -134,13 +134,13 @@ jobs:
           bazel clean
 
           # Build an archive of the repo contents.
-          # `examples/bzlmod` is included for the BCR presubmit; it must appear before --exclude="examples"
+          # `examples/hello_world` is included for the BCR presubmit; it must appear before --exclude="examples"
           tar -czf ${{ github.workspace }}/.github/rules_rust.tar.gz \
             -C ${{ github.workspace }} \
             --exclude=".git" \
             --exclude=".github" \
             --exclude="crate_universe/target" \
-            examples/bzlmod \
+            examples/hello_world \
             --exclude="examples" \
             .
 

diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,7 @@
 /test/no_std/bazel-*
 /docs/bazel-*
 user.bazelrc
-MODULE.bazel.lock
+/MODULE.bazel.lock
 
 # rustfmt
 *.rs.bk

diff --git a/docs/.gitignore b/docs/.gitignore
@@ -1 +1,3 @@
 book
+MODULE.bazel.lock
+user.bazelrc
diff --git a/examples/.bazelignore b/examples/.bazelignore