From e11dc76e63b963e4d0e292e8064ea11aa7d2f440 Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Sun, 24 Nov 2024 13:46:54 +0000 Subject: [PATCH] Fix up CI job specs --- .bazelci/presubmit.yml | 14 +++++++------- .bcr/presubmit.yml | 4 ++-- examples/bzlmod/hello_world/MODULE.bazel | 5 ++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index a31c0b62a0..92bc66d716 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -723,7 +723,7 @@ tasks: working_directory: examples/bzlmod/hello_world test_flags: *bzlmod_flags run_targets: - - "//third-party:vendor" + - "//third-party-in-workspace:vendor" - "@rules_rust//tools/rust_analyzer:gen_rust_project" test_targets: - "//..." @@ -735,7 +735,7 @@ tasks: shell_commands: - "rm MODULE.bazel.lock" run_targets: - - "//third-party:vendor" + - "//third-party-in-workspace:vendor" - "@rules_rust//tools/rust_analyzer:gen_rust_project" test_targets: - "//..." @@ -745,7 +745,7 @@ tasks: working_directory: examples/bzlmod/hello_world test_flags: *bzlmod_flags run_targets: - - "//third-party:vendor" + - "//third-party-in-workspace:vendor" - "@rules_rust//tools/rust_analyzer:gen_rust_project" test_targets: - "//..." @@ -756,7 +756,7 @@ tasks: # working_directory: examples/bzlmod/hello_world # test_flags: *bzlmod_flags # run_targets: - # - "//third-party:vendor" + # - "//third-party-in-workspace:vendor" # build_targets: # - "@rules_rust//tools/rust_analyzer:gen_rust_project" # test_targets: @@ -770,7 +770,7 @@ tasks: working_directory: examples/bzlmod/hello_world test_flags: *bzlmod_plus_repo_names_flags run_targets: - - "//third-party:vendor" + - "//third-party-in-workspace:vendor" - "@rules_rust//tools/rust_analyzer:gen_rust_project" test_targets: - "//..." @@ -783,7 +783,7 @@ tasks: working_directory: examples/bzlmod/hello_world test_flags: *bzlmod_plus_repo_names_flags run_targets: - - "//third-party:vendor" + - "//third-party-in-workspace:vendor" - "@rules_rust//tools/rust_analyzer:gen_rust_project" test_targets: - "//..." @@ -796,7 +796,7 @@ tasks: working_directory: examples/bzlmod/hello_world test_flags: *bzlmod_plus_repo_names_flags run_targets: - - "//third-party:vendor" + - "//third-party-in-workspace:vendor" build_targets: - "@rules_rust//tools/rust_analyzer:gen_rust_project" test_targets: diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index 98834ec9ae..bafa8e2727 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -13,7 +13,7 @@ bcr_test_module: shell_commands: - "rm MODULE.bazel.lock" run_targets: - - "//third-party:vendor" + - "//third-party-in-workspace:vendor" - "@rules_rust//tools/rust_analyzer:gen_rust_project" test_targets: - "//..." @@ -32,7 +32,7 @@ bcr_test_module_windows: shell_commands: - "rm MODULE.bazel.lock" run_targets: - - "//third-party:vendor" + - "//third-party-in-workspace:vendor" build_targets: - "@rules_rust//tools/rust_analyzer:gen_rust_project" test_targets: diff --git a/examples/bzlmod/hello_world/MODULE.bazel b/examples/bzlmod/hello_world/MODULE.bazel index 794dd27efe..b0c8b442dd 100644 --- a/examples/bzlmod/hello_world/MODULE.bazel +++ b/examples/bzlmod/hello_world/MODULE.bazel @@ -39,7 +39,10 @@ crate.annotation( data = [":cargo_toml"], # Optional, you probably don't need this. Defaults to all from_cargo # invocations in this module. - repositories = ["crates_in_workspace", "crates_without_workspace"], + repositories = [ + "crates_in_workspace", + "crates_without_workspace", + ], # Optional, you probably don't need this, defaults to "*". version = "*", )