flowey: add explicit no_incremental flag for cargo builds

Author: justus-camp-microsoft

flowey/flowey_hvlite/src/pipelines/build_igvm.rs

@@ -407,6 +407,7 @@ impl IntoPipeline for BuildIgvmCli {
             verbose: ReadVar::from_static(verbose),
             locked,
             deny_warnings: false,
+            no_incremental: false,
         })
         .dep_on(|ctx| flowey_lib_hvlite::_jobs::local_build_igvm::Params {
             artifact_dir: ctx.publish_artifact(pub_out_dir),

flowey/flowey_hvlite/src/pipelines/build_reproducible.rs

@@ -57,10 +57,16 @@ impl IntoPipeline for BuildReproducibleCli {
         let (pub_openhcl_igvm_extras, _use_openhcl_igvm_extras) =
             pipeline.new_artifact("x64-cvm-openhcl-igvm-extras");
 
+        let local_run_args = {
+            let mut args = crate::pipelines_shared::cfg_common_params::LocalRunArgs::default();
+            args.locked = true;
+            args.no_incremental = true;
+            args
+        };
         let cfg_common_params = crate::pipelines_shared::cfg_common_params::get_cfg_common_params(
             &mut pipeline,
             backend_hint,
-            None,
+            Some(local_run_args),
         )?;
 
         let openvmm_repo_source =

flowey/flowey_hvlite/src/pipelines/custom_vmfirmwareigvm_dll.rs

@@ -83,6 +83,7 @@ impl IntoPipeline for CustomVmfirmwareigvmDllCli {
                 verbose: ReadVar::from_static(false),
                 locked: false,
                 deny_warnings: false,
+                no_incremental: false,
             })
             .dep_on(
                 |ctx| flowey_lib_hvlite::_jobs::local_custom_vmfirmwareigvm_dll::Params {

flowey/flowey_hvlite/src/pipelines/restore_packages.rs

@@ -43,6 +43,7 @@ impl IntoPipeline for RestorePackagesCli {
                 verbose: ReadVar::from_static(true),
                 locked: false,
                 deny_warnings: false,
+                no_incremental: false,
             });
 
         let arches = {

flowey/flowey_hvlite/src/pipelines/vmm_tests.rs

@@ -173,6 +173,7 @@ impl IntoPipeline for VmmTestsCli {
                 verbose: ReadVar::from_static(verbose),
                 locked: false,
                 deny_warnings: false,
+                no_incremental: false,
             })
             .dep_on(|ctx| {
                 flowey_lib_hvlite::_jobs::local_build_and_run_nextest_vmm_tests::Params {

flowey/flowey_hvlite/src/pipelines_shared/cfg_common_params.rs

@@ -16,7 +16,11 @@ pub struct LocalRunArgs {
 
     /// Run builds with --locked
     #[clap(long)]
-    locked: bool,
+    pub locked: bool,
+
+    /// Disable incremental compilation (sets CARGO_INCREMENTAL=0)
+    #[clap(long)]
+    pub no_incremental: bool,
 
     /// Automatically install all required dependencies
     #[clap(long)]
@@ -37,6 +41,7 @@ fn get_params_local(
         let LocalRunArgs {
             verbose,
             locked,
+            no_incremental,
             auto_install_deps,
             non_interactive,
         } = local_run_args.clone().unwrap_or_default();
@@ -50,6 +55,7 @@ fn get_params_local(
             verbose: ReadVar::from_static(verbose),
             locked,
             deny_warnings: false,
+            no_incremental,
         }
     }))
 }
@@ -70,6 +76,7 @@ fn get_params_cloud(
             verbose: ctx.use_parameter(param_verbose.clone()),
             locked: true,
             deny_warnings: true,
+            no_incremental: true,
         }
     }))
 }

flowey/flowey_lib_common/src/cfg_cargo_common_flags.rs

@@ -14,12 +14,14 @@ use flowey::node::prelude::*;
 pub struct Flags {
     pub locked: bool,
     pub verbose: bool,
+    pub no_incremental: bool,
 }
 
 flowey_request! {
     pub enum Request {
         SetLocked(bool),
         SetVerbose(ReadVar<bool>),
+        SetNoIncremental(bool),
         GetFlags(WriteVar<Flags>),
     }
 }
@@ -37,13 +39,17 @@ impl FlowNode for Node {
         let mut set_locked = None;
         let mut set_verbose = None;
         let mut get_flags = Vec::new();
+        let mut set_no_incremental = None;
 
         for req in requests {
             match req {
                 Request::SetLocked(v) => same_across_all_reqs("SetLocked", &mut set_locked, v)?,
                 Request::SetVerbose(v) => {
                     same_across_all_reqs_backing_var("SetVerbose", &mut set_verbose, v)?
                 }
+                Request::SetNoIncremental(v) => {
+                    same_across_all_reqs("SetNoIncremental", &mut set_no_incremental, v)?
+                }
                 Request::GetFlags(v) => get_flags.push(v),
             }
         }
@@ -52,6 +58,7 @@ impl FlowNode for Node {
             set_locked.ok_or(anyhow::anyhow!("Missing essential request: SetLocked"))?;
         let set_verbose =
             set_verbose.ok_or(anyhow::anyhow!("Missing essential request: SetVerbose"))?;
+        let set_no_incremental = set_no_incremental.unwrap_or(false);
         let get_flags = get_flags;
 
         // -- end of req processing -- //
@@ -72,6 +79,7 @@ impl FlowNode for Node {
                         &Flags {
                             locked: set_locked,
                             verbose: set_verbose,
+                            no_incremental: set_no_incremental,
                         },
                     );
                 }

flowey/flowey_lib_common/src/gen_cargo_nextest_run_cmd.rs

@@ -342,12 +342,6 @@ impl FlowNode for Node {
                         with_env.insert("RUST_BACKTRACE".into(), "1".into());
                     }
 
-                    // if running in CI, no need to waste time with incremental
-                    // build artifacts
-                    if !matches!(rt.backend(), FlowBackend::Local) {
-                        with_env.insert("CARGO_INCREMENTAL".into(), "0".into());
-                    }
-
                     // also update WSLENV in cases where we're running windows tests via WSL2
                     if !portable && crate::_util::running_in_wsl(rt) {
                         let old_wslenv = std::env::var("WSLENV");
@@ -405,6 +399,7 @@ pub(crate) fn cargo_nextest_build_args_and_env(
     no_default_features: bool,
     mut extra_env: BTreeMap<String, String>,
 ) -> (Vec<String>, BTreeMap<String, String>) {
+    let no_incremental = cargo_flags.no_incremental;
     let locked = cargo_flags.locked.then_some("--locked");
     let verbose = cargo_flags.verbose.then_some("--verbose");
     let cargo_profile = match &cargo_profile {
@@ -452,6 +447,10 @@ pub(crate) fn cargo_nextest_build_args_and_env(
 
     let mut env = BTreeMap::new();
 
+    if no_incremental {
+        env.insert("CARGO_INCREMENTAL".into(), "0".into());
+    }
+
     env.append(&mut extra_env);
 
     (args, env)

flowey/flowey_lib_common/src/run_cargo_build.rs

@@ -187,7 +187,11 @@ impl FlowNode for Node {
                     let in_folder = rt.read(in_folder);
                     let with_env = rt.read(extra_env).unwrap_or_default();
 
-                    let crate::cfg_cargo_common_flags::Flags { locked, verbose } = flags;
+                    let crate::cfg_cargo_common_flags::Flags {
+                        locked,
+                        verbose,
+                        no_incremental,
+                    } = flags;
 
                     let cargo_profile = match &profile {
                         CargoBuildProfile::Debug => "dev",
@@ -265,12 +269,10 @@ impl FlowNode for Node {
 
                     rt.sh.change_dir(cargo_work_dir);
                     let mut cmd = flowey::shell_cmd!(rt, "{argv0} {params...}");
-                    if !matches!(rt.backend(), FlowBackend::Local) {
-                        // if running in CI, no need to waste time with incremental
-                        // build artifacts
+                    if no_incremental {
                         with_env.insert("CARGO_INCREMENTAL".to_owned(), "0".to_owned());
-                    } else {
-                        // if build locally, use per-package target dirs
+                    } else if matches!(rt.backend(), FlowBackend::Local) {
+                        // if building locally, use per-package target dirs
                         // to avoid rebuilding
                         // TODO: remove this once cargo's caching improves
                         cmd = cmd

flowey/flowey_lib_common/src/run_cargo_clippy.rs

@@ -81,7 +81,11 @@ impl FlowNode for Node {
                     let in_folder = rt.read(in_folder);
                     let exclude = rt.read(exclude);
 
-                    let crate::cfg_cargo_common_flags::Flags { locked, verbose } = flags;
+                    let crate::cfg_cargo_common_flags::Flags {
+                        locked,
+                        verbose,
+                        no_incremental,
+                    } = flags;
 
                     let target = target.to_string();
 
@@ -134,9 +138,7 @@ impl FlowNode for Node {
                         flowey::shell_cmd!(rt, "cargo")
                     };
 
-                    // if running in CI, no need to waste time with incremental
-                    // build artifacts
-                    if !matches!(rt.backend(), FlowBackend::Local) {
+                    if no_incremental {
                         cmd = cmd.env("CARGO_INCREMENTAL", "0");
                     }
                     if let Some(env) = extra_env {