From 7298c16f6af0b80a90876d38c88b0708838bf089 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 11:13:46 -0400 Subject: [PATCH 1/9] Make path not leave root. --- tools/ci/src/commands/bench_check.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/src/commands/bench_check.rs b/tools/ci/src/commands/bench_check.rs index 748f10a730f72..f0909b2c91cec 100644 --- a/tools/ci/src/commands/bench_check.rs +++ b/tools/ci/src/commands/bench_check.rs @@ -14,7 +14,7 @@ impl Prepare for BenchCheckCommand { vec![PreparedCommand::new::( cmd!( sh, - "cargo check --benches {jobs...} --target-dir ../target --manifest-path ./benches/Cargo.toml" + "cargo check --benches {jobs...} --target-dir ./target --manifest-path ./benches/Cargo.toml" ), "Failed to check the benches.", )] From dd76544f0b7625afba42d55fa3aec59420c07450 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 14:46:48 -0400 Subject: [PATCH 2/9] Remove target-dir override in bench-check --- tools/ci/src/commands/bench_check.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/src/commands/bench_check.rs b/tools/ci/src/commands/bench_check.rs index f0909b2c91cec..660d468cfa08c 100644 --- a/tools/ci/src/commands/bench_check.rs +++ b/tools/ci/src/commands/bench_check.rs @@ -14,7 +14,7 @@ impl Prepare for BenchCheckCommand { vec![PreparedCommand::new::( cmd!( sh, - "cargo check --benches {jobs...} --target-dir ./target --manifest-path ./benches/Cargo.toml" + "cargo check --benches {jobs...} --manifest-path ./benches/Cargo.toml" ), "Failed to check the benches.", )] From ad0747f49003b58bc57a88d57112c1605a4e780f Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 15:00:05 -0400 Subject: [PATCH 3/9] Fixed CompileFail comment dirs. --- tools/ci/src/commands/compile_fail.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci/src/commands/compile_fail.rs b/tools/ci/src/commands/compile_fail.rs index e2c6e62d944b6..7427e3b912357 100644 --- a/tools/ci/src/commands/compile_fail.rs +++ b/tools/ci/src/commands/compile_fail.rs @@ -19,7 +19,7 @@ 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_macros/compile_fail/README.md commands.push( PreparedCommand::new::( cmd!(sh, "cargo test --target-dir ../../../target {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"), @@ -30,7 +30,7 @@ impl Prepare for CompileFailCommand { // 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...}"), @@ -41,7 +41,7 @@ impl Prepare for CompileFailCommand { // 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...}"), From fcd2a37384eea36a322b42737fddf4f84e5f63d9 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 16:35:35 -0400 Subject: [PATCH 4/9] Use manifest-path instead of subdir to share target-dir for CompileFail CI. --- tools/ci/src/commands/compile_fail.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/ci/src/commands/compile_fail.rs b/tools/ci/src/commands/compile_fail.rs index 7427e3b912357..349a5c5c9d080 100644 --- a/tools/ci/src/commands/compile_fail.rs +++ b/tools/ci/src/commands/compile_fail.rs @@ -22,10 +22,9 @@ impl Prepare for CompileFailCommand { // - See crates/bevy_macros/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 {no_fail_fast...} {jobs_ref...} --manifest-path crates/bevy_derive/compile_fail/Cargo.toml -- {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 @@ -33,10 +32,9 @@ impl Prepare for CompileFailCommand { // - 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 {no_fail_fast...} {jobs_ref...} --manifest-path crates/bevy_ecs/compile_fail/Cargo.toml -- {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 @@ -44,10 +42,9 @@ impl Prepare for CompileFailCommand { // - 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 {no_fail_fast...} {jobs...} --manifest-path crates/bevy_reflect/compile_fail/Cargo.toml -- {test_threads...}"), "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 From e515a8d778e6acf7d19e5e75342f9b120e85ffd5 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 19:12:31 -0400 Subject: [PATCH 5/9] Revert "Use manifest-path instead of subdir to share target-dir for CompileFail CI." This reverts commit fcd2a37384eea36a322b42737fddf4f84e5f63d9. --- tools/ci/src/commands/compile_fail.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/ci/src/commands/compile_fail.rs b/tools/ci/src/commands/compile_fail.rs index 349a5c5c9d080..7427e3b912357 100644 --- a/tools/ci/src/commands/compile_fail.rs +++ b/tools/ci/src/commands/compile_fail.rs @@ -22,9 +22,10 @@ impl Prepare for CompileFailCommand { // - See crates/bevy_macros/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test {no_fail_fast...} {jobs_ref...} --manifest-path crates/bevy_derive/compile_fail/Cargo.toml -- {test_threads_ref...}"), + cmd!(sh, "cargo test --target-dir ../../../target {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 @@ -32,9 +33,10 @@ impl Prepare for CompileFailCommand { // - See crates/bevy_ecs/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test {no_fail_fast...} {jobs_ref...} --manifest-path crates/bevy_ecs/compile_fail/Cargo.toml -- {test_threads_ref...}"), + cmd!(sh, "cargo test --target-dir ../../../target {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 @@ -42,9 +44,10 @@ impl Prepare for CompileFailCommand { // - See crates/bevy_reflect/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test {no_fail_fast...} {jobs...} --manifest-path crates/bevy_reflect/compile_fail/Cargo.toml -- {test_threads...}"), + cmd!(sh, "cargo test --target-dir ../../../target {no_fail_fast...} {jobs...} -- {test_threads...}"), "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 From b9a07d3a69b72ae1efb552a38c138771fefe4be8 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 19:20:18 -0400 Subject: [PATCH 6/9] Don't specify target-dir is CompileFail tests. --- tools/ci/src/commands/compile_fail.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ci/src/commands/compile_fail.rs b/tools/ci/src/commands/compile_fail.rs index 7427e3b912357..8d4593f4e727d 100644 --- a/tools/ci/src/commands/compile_fail.rs +++ b/tools/ci/src/commands/compile_fail.rs @@ -22,7 +22,7 @@ impl Prepare for CompileFailCommand { // - See crates/bevy_macros/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 {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"), @@ -33,7 +33,7 @@ impl Prepare for CompileFailCommand { // - 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 {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"), @@ -44,7 +44,7 @@ impl Prepare for CompileFailCommand { // - 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 {no_fail_fast...} {jobs...} -- {test_threads...}"), "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"), From b7fab7cce2040dd977dd1b7c50ae3e9ba769ae0c Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 20:11:18 -0400 Subject: [PATCH 7/9] Change bench-check to use subdir to follow pattern established by compile fail --- tools/ci/src/commands/bench_check.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/ci/src/commands/bench_check.rs b/tools/ci/src/commands/bench_check.rs index 660d468cfa08c..b68e734cab8bc 100644 --- a/tools/ci/src/commands/bench_check.rs +++ b/tools/ci/src/commands/bench_check.rs @@ -12,11 +12,9 @@ impl Prepare for BenchCheckCommand { let jobs = args.build_jobs(); vec![PreparedCommand::new::( - cmd!( - sh, - "cargo check --benches {jobs...} --manifest-path ./benches/Cargo.toml" - ), + cmd!(sh, "cargo check --benches {jobs...}"), "Failed to check the benches.", - )] + ) + .with_subdir("benches")] } } From 7f3a363419b8f094bd3a71f746c3c3e1ba37a138 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 20:43:10 -0400 Subject: [PATCH 8/9] fixed comment bevy_macros -> bevy_derive --- tools/ci/src/commands/compile_fail.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/src/commands/compile_fail.rs b/tools/ci/src/commands/compile_fail.rs index 8d4593f4e727d..984f6e2ed0075 100644 --- a/tools/ci/src/commands/compile_fail.rs +++ b/tools/ci/src/commands/compile_fail.rs @@ -19,7 +19,7 @@ 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/README.md + // - See crates/bevy_derive/compile_fail/README.md commands.push( PreparedCommand::new::( cmd!(sh, "cargo test {no_fail_fast...} {jobs_ref...} -- {test_threads_ref...}"), From d229f8649dbf2c8ec865fd0ec06cffa75bdb3da6 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 11 May 2026 20:49:54 -0400 Subject: [PATCH 9/9] Switch to workspace qualifiers. --- tools/ci/src/commands/bench_check.rs | 5 ++--- tools/ci/src/commands/compile_fail.rs | 15 ++++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/ci/src/commands/bench_check.rs b/tools/ci/src/commands/bench_check.rs index b68e734cab8bc..f5a252bf7ed8f 100644 --- a/tools/ci/src/commands/bench_check.rs +++ b/tools/ci/src/commands/bench_check.rs @@ -12,9 +12,8 @@ impl Prepare for BenchCheckCommand { let jobs = args.build_jobs(); vec![PreparedCommand::new::( - cmd!(sh, "cargo check --benches {jobs...}"), + cmd!(sh, "cargo check -p benches --benches {jobs...}"), "Failed to check the benches.", - ) - .with_subdir("benches")] + )] } } diff --git a/tools/ci/src/commands/compile_fail.rs b/tools/ci/src/commands/compile_fail.rs index 984f6e2ed0075..1eda55d3e4db1 100644 --- a/tools/ci/src/commands/compile_fail.rs +++ b/tools/ci/src/commands/compile_fail.rs @@ -22,10 +22,9 @@ impl Prepare for CompileFailCommand { // - See crates/bevy_derive/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test {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 @@ -33,10 +32,9 @@ impl Prepare for CompileFailCommand { // - See crates/bevy_ecs/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test {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 @@ -44,10 +42,9 @@ impl Prepare for CompileFailCommand { // - See crates/bevy_reflect/compile_fail/README.md commands.push( PreparedCommand::new::( - cmd!(sh, "cargo test {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