feat: use variant config when discovering and building outputs (#30)

Author: wolfv

Cargo.lock

@@ -146,7 +146,8 @@ impl Protocol for RattlerBuildBackend {
             .channel_base_urls
             .unwrap_or_else(|| vec![Url::from_str("https://prefix.dev/conda-forge").unwrap()]);
 
-        let discovered_outputs = rattler_build_tool.discover_outputs()?;
+        let discovered_outputs =
+            rattler_build_tool.discover_outputs(&params.variant_configuration)?;
 
         let host_vpkgs = params
             .host_platform
@@ -294,7 +295,8 @@ impl Protocol for RattlerBuildBackend {
             params.work_directory.clone(),
         );
 
-        let discovered_outputs = rattler_build_tool.discover_outputs()?;
+        let discovered_outputs =
+            rattler_build_tool.discover_outputs(&params.variant_configuration)?;
 
         let outputs = rattler_build_tool.get_outputs(
             &discovered_outputs,
@@ -406,6 +408,7 @@ mod tests {
                 },
                 channel_base_urls: None,
                 work_directory: current_dir,
+                variant_configuration: None,
             })
             .await
             .unwrap();
@@ -442,6 +445,7 @@ mod tests {
                 },
                 outputs: None,
                 work_directory: current_dir.into_path(),
+                variant_configuration: None,
             })
             .await
             .unwrap();

crates/pixi-build/src/bin/pixi-build-rattler-build/rattler_build.rs

@@ -135,6 +135,7 @@ async fn get_conda_metadata(
                 base_url: channel_config.channel_alias,
             },
             work_directory: tempdir.path().to_path_buf(),
+            variant_configuration: None,
         })
         .await
 }
@@ -170,6 +171,7 @@ async fn build(factory: impl ProtocolFactory, manifest_path: &Path) -> miette::R
             },
             outputs: None,
             work_directory: work_dir.path().to_path_buf(),
+            variant_configuration: None,
         })
         .await?;
 

crates/pixi-build/src/cli.rs

@@ -1,4 +1,7 @@
-use std::{collections::BTreeMap, path::PathBuf};
+use std::{
+    collections::{BTreeMap, HashMap},
+    path::PathBuf,
+};
 
 use chrono::Utc;
 use indexmap::IndexSet;
@@ -83,7 +86,10 @@ impl RattlerBuild {
     }
 
     /// Discover the outputs from the recipe.
-    pub fn discover_outputs(&self) -> miette::Result<IndexSet<DiscoveredOutput>> {
+    pub fn discover_outputs(
+        &self,
+        variant_config_input: &Option<HashMap<String, Vec<String>>>,
+    ) -> miette::Result<IndexSet<DiscoveredOutput>> {
         // First find all outputs from the recipe
         let outputs = find_outputs_from_src(&self.raw_recipe)?;
 
@@ -102,9 +108,15 @@ impl RattlerBuild {
 
         let variant_configs = variant_configs.unwrap_or_default();
 
-        let variant_config =
+        let mut variant_config =
             VariantConfig::from_files(&variant_configs, &self.selector_config).into_diagnostic()?;
 
+        if let Some(variant_config_input) = variant_config_input {
+            for (k, v) in variant_config_input.iter() {
+                variant_config.variants.insert(k.into(), v.clone());
+            }
+        }
+
         variant_config
             .find_variants(&outputs, &self.raw_recipe, &self.selector_config)
             .into_diagnostic()