keep iterating on build

Author: justus-camp-microsoft

flowey/flowey_lib_common/src/install_nix.rs

@@ -12,7 +12,7 @@ flowey_request! {
     pub enum Request {
         /// Automatically install Nix package manager.
         ///
-        /// Only supported on Github backend.
+        /// Supported on Github and ADO backends.
         AutoInstall(bool),
 
         /// Ensure that Nix was installed and is available on the $PATH
@@ -26,10 +26,6 @@ impl FlowNode for Node {
     fn imports(_ctx: &mut ImportCtx<'_>) {}
 
     fn emit(requests: Vec<Self::Request>, ctx: &mut NodeCtx<'_>) -> anyhow::Result<()> {
-        if !matches!(ctx.backend(), FlowBackend::Github) {
-            anyhow::bail!("only supported on the Github backend at this time");
-        }
-
         let mut ensure_installed = Vec::new();
         let mut auto_install = None;
 
@@ -50,17 +46,38 @@ impl FlowNode for Node {
 
         if !ensure_installed.is_empty() && auto_install {
             // Add nix profile bin to PATH first
-            let added_to_path = ctx.emit_rust_step("add nix profile to path", |_| {
-                |_| {
+            let added_to_path = ctx.emit_rust_step("add nix profile to path", |ctx| {
+                let backend = ctx.backend();
+                move |_| {
                     let nix_profile_bin = home::home_dir()
                         .context("Unable to get home dir")?
                         .join(".nix-profile")
                         .join("bin");
-                    let github_path = std::env::var("GITHUB_PATH")?;
-                    let mut github_path = fs_err::File::options().append(true).open(github_path)?;
-                    github_path.write_all(nix_profile_bin.as_os_str().as_encoded_bytes())?;
-                    github_path.write_all(b"\n")?;
-                    log::info!("Added {} to PATH", nix_profile_bin.display());
+
+                    match backend {
+                        FlowBackend::Github => {
+                            let github_path = std::env::var("GITHUB_PATH")?;
+                            let mut github_path =
+                                fs_err::File::options().append(true).open(github_path)?;
+                            github_path
+                                .write_all(nix_profile_bin.as_os_str().as_encoded_bytes())?;
+                            github_path.write_all(b"\n")?;
+                            log::info!("Added {} to PATH (Github)", nix_profile_bin.display());
+                        }
+                        FlowBackend::Ado => {
+                            // ADO uses logging commands to update PATH
+                            println!("##vso[task.prependpath]{}", nix_profile_bin.display());
+                            log::info!("Added {} to PATH (ADO)", nix_profile_bin.display());
+                        }
+                        FlowBackend::Local => {
+                            log::warn!("Cannot automatically add to PATH in local backend");
+                            log::warn!(
+                                "Please add {} to your PATH manually",
+                                nix_profile_bin.display()
+                            );
+                        }
+                    }
+
                     Ok(())
                 }
             });

flowey/flowey_lib_common/src/nix_deps_provider.rs

@@ -32,7 +32,9 @@ new_flow_node!(struct Node);
 impl FlowNode for Node {
     type Request = Request;
 
-    fn imports(_ctx: &mut ImportCtx<'_>) {}
+    fn imports(ctx: &mut ImportCtx<'_>) {
+        ctx.import::<crate::install_nix::Node>();
+    }
 
     fn emit(requests: Vec<Self::Request>, ctx: &mut NodeCtx<'_>) -> anyhow::Result<()> {
         let mut repo_path = None;
@@ -42,6 +44,8 @@ impl FlowNode for Node {
         let mut openhcl_kernel_requests = Vec::new();
         let mut uefi_mu_msvm_requests = Vec::new();
 
+        let nix_installed = ctx.reqv(crate::install_nix::Request::EnsureInstalled);
+
         // Parse all requests and group by type
         for req in requests {
             match req {
@@ -69,6 +73,7 @@ impl FlowNode for Node {
         }
 
         ctx.emit_rust_step("resolve nix dependency paths", |ctx| {
+            nix_installed.claim(ctx);
             let repo_path = repo_path.claim(ctx);
             let openvmm_deps_requests = openvmm_deps_requests.claim(ctx);
             let protoc_requests = protoc_requests.claim(ctx);

flowey/flowey_lib_hvlite/src/build_openhcl_initrd.rs

@@ -117,6 +117,7 @@ impl FlowNode for Node {
 
             ctx.emit_rust_step("building openhcl initrd", |ctx| {
                 pydeps.clone().claim(ctx);
+                let platform = ctx.platform();
                 let interactive_dep = interactive_dep.claim(ctx);
                 let rootfs_config = rootfs_config.claim(ctx);
                 let extra_env = extra_env.claim(ctx);
@@ -132,7 +133,7 @@ impl FlowNode for Node {
                     let openvmm_repo_path = rt.read(openvmm_repo_path);
                     let kernel_package_root = rt.read(kernel_package_root);
 
-                    let sh = xshell::Shell::new()?;
+                    let sh = FloweyShell::new(platform)?;
 
                     let initrd_path = sh.current_dir().join("openhcl.cpio.gz");
 

openhcl_kernel.nix

@@ -40,11 +40,10 @@ in stdenv.mkDerivation {
 
   installPhase = ''
     runHook preInstall
-    mkdir $out
-    cp vmlinux* $out
-    mkdir -p $out/modules/build/native/bin/${arch}
-    cp kernel_build_metadata.json $out/modules/build/native/bin/
-    cp -r modules $out/modules/build/native/bin/${arch}
+    mkdir -p $out/build/native/bin/${arch}
+    cp vmlinux* $out/build/native/bin/${arch}/
+    cp kernel_build_metadata.json $out/build/native/bin/
+    cp -r modules $out/build/native/bin/${arch}/
     runHook postInstall
   '';
 }

shell.nix

@@ -50,8 +50,7 @@ in pkgs.mkShell.override { } {
 
   NIX_OPENVMM_DEPS = openvmm_deps;
   NIX_PROTOC_PATH = protoc;
-  NIX_OPENHCL_KERNEL = "${openhcl_kernel}/vmlinux";
-  NIX_OPENHCL_KERNEL_MODULES = "${openhcl_kernel}/modules";
+  NIX_OPENHCL_KERNEL = openhcl_kernel;
   NIX_UEFI_MU_MSVM = "${uefi_mu_msvm}/MSVM.fd";
   RUST_BACKTRACE = 1;
   # will probably need more than one of these for local source + dependencies.