From c50c2e439dd7c52cb8d7465d738d548a5f1a6055 Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Fri, 8 Nov 2024 07:43:53 -0800 Subject: [PATCH] xtask: Fix `lint --scope=only-fuzz` trying and failing to `build_web()`. --- tools/xtask/src/xtask.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/xtask/src/xtask.rs b/tools/xtask/src/xtask.rs index 71b656448..89d13635e 100644 --- a/tools/xtask/src/xtask.rs +++ b/tools/xtask/src/xtask.rs @@ -565,6 +565,10 @@ fn build_web( time_log: &mut Vec, profile: Profile, ) -> Result<(), ActionError> { + // Currently, wasm is considered part of the main workspace scope, + // even though it is actually a separate workspace. This is a bug. + // + // assert!(config.scope.includes_main_workspace()); let wasm_package_dir: &Path = &PROJECT_DIR.join("all-is-cubes-wasm"); @@ -686,10 +690,10 @@ fn do_for_all_packages( ) -> Result<(), ActionError> { if config.scope.includes_main_workspace() { ensure_wasm_tools_installed(config, time_log)?; - } - // Ensure all-is-cubes-server build that might be looking for the web client files will succeed. - build_web(config, time_log, Profile::Dev)?; + // Ensure all-is-cubes-server build that might be looking for the web client files will succeed. + build_web(config, time_log, Profile::Dev)?; + } // Test everything we can with default features and target. // But if we're linting, then the below --all-targets run will handle that.