diff --git a/tools/ci/src/commands/bench_check.rs b/tools/ci/src/commands/bench_check.rs index 748f10a730f72..f5a252bf7ed8f 100644 --- a/tools/ci/src/commands/bench_check.rs +++ b/tools/ci/src/commands/bench_check.rs @@ -12,10 +12,7 @@ impl Prepare for BenchCheckCommand { let jobs = args.build_jobs(); vec![PreparedCommand::new::( - cmd!( - sh, - "cargo check --benches {jobs...} --target-dir ../target --manifest-path ./benches/Cargo.toml" - ), + cmd!(sh, "cargo check -p benches --benches {jobs...}"), "Failed to check the benches.", )] } diff --git a/tools/ci/src/commands/compile_fail.rs b/tools/ci/src/commands/compile_fail.rs index e2c6e62d944b6..1eda55d3e4db1 100644 --- a/tools/ci/src/commands/compile_fail.rs +++ b/tools/ci/src/commands/compile_fail.rs @@ -19,35 +19,32 @@ impl Prepare for CompileFailCommand { // Macro Compile Fail Tests // Run tests (they do not get executed with the workspace tests) - // - See crates/bevy_macros_compile_fail_tests/README.md + // - See crates/bevy_derive/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test --target-dir ../../../target {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"), + cmd!(sh, "cargo test -p bevy_derive_compile_fail {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"), "Compiler errors of the macros compile fail tests seem to be different than expected! Check locally and compare rust versions.", - ) - .with_subdir("crates/bevy_derive/compile_fail"), + ), ); // ECS Compile Fail Tests // Run UI tests (they do not get executed with the workspace tests) - // - See crates/bevy_ecs_compile_fail_tests/README.md + // - See crates/bevy_ecs/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test --target-dir ../../../target {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"), + cmd!(sh, "cargo test -p bevy_ecs_compile_fail {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"), "Compiler errors of the ECS compile fail tests seem to be different than expected! Check locally and compare rust versions.", - ) - .with_subdir("crates/bevy_ecs/compile_fail"), + ), ); // Reflect Compile Fail Tests // Run tests (they do not get executed with the workspace tests) - // - See crates/bevy_reflect_compile_fail_tests/README.md + // - See crates/bevy_reflect/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test --target-dir ../../../target {no_fail_fast...} {jobs...} -- {test_threads...}"), + cmd!(sh, "cargo test -p bevy_reflect_compile_fail {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"), "Compiler errors of the Reflect compile fail tests seem to be different than expected! Check locally and compare rust versions.", - ) - .with_subdir("crates/bevy_reflect/compile_fail"), + ), ); commands