add target to workspace for [workspace.target.win-64.build-variants] support

Author: wolfv

crates/pixi_manifest/src/pyproject.rs

@@ -267,7 +267,6 @@ impl PyProjectManifest {
                 homepage: None,
                 repository: None,
                 documentation: None,
-                build_variants: None,
             })?;
 
         // Add python as dependency based on the `project.requires_python` property

crates/pixi_manifest/src/toml/workspace.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, path::PathBuf};
 
-use indexmap::IndexSet;
+use indexmap::{IndexMap, IndexSet};
 use rattler_conda_types::{NamedChannelOrUrl, Platform, Version};
 use rattler_solve::ChannelPriority;
 use serde::Deserialize;
@@ -10,9 +10,15 @@ use url::Url;
 
 use crate::{
     preview::Preview, pypi::pypi_options::PypiOptions, utils::PixiSpanned, PrioritizedChannel,
-    Workspace,
+    TargetSelector, Targets, Workspace,
 };
 
+#[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields, rename_all = "kebab-case")]
+pub struct TomlWorkspaceTarget {
+    build_variants: Option<HashMap<String, Vec<String>>>,
+}
+
 /// The TOML representation of the `[[workspace]]` section in a pixi manifest.
 #[serde_as]
 #[derive(Debug, Clone, Deserialize)]
@@ -46,6 +52,9 @@ pub struct TomlWorkspace {
     #[serde(default)]
     pub preview: Preview,
 
+    #[serde(default)]
+    pub target: IndexMap<PixiSpanned<TargetSelector>, TomlWorkspaceTarget>,
+
     pub build_variants: Option<HashMap<String, Vec<String>>>,
 }
 
@@ -65,7 +74,6 @@ pub struct ExternalWorkspaceProperties {
     pub homepage: Option<Url>,
     pub repository: Option<Url>,
     pub documentation: Option<Url>,
-    pub build_variants: Option<HashMap<String, Vec<String>>>,
 }
 
 #[derive(Debug, Error)]
@@ -99,7 +107,14 @@ impl TomlWorkspace {
             conda_pypi_map: self.conda_pypi_map,
             pypi_options: self.pypi_options,
             preview: self.preview,
-            build_variants: self.build_variants.or(external.build_variants),
+            build_variants: Targets::from_default_and_user_defined(
+                self.build_variants,
+                self.target
+                    .clone()
+                    .into_iter()
+                    .map(|(k, v)| (k, v.build_variants))
+                    .collect(),
+            ),
         })
     }
 }

crates/pixi_manifest/src/workspace.rs

@@ -6,7 +6,7 @@ use rattler_solve::ChannelPriority;
 use url::Url;
 
 use super::pypi::pypi_options::PypiOptions;
-use crate::{preview::Preview, utils::PixiSpanned, PrioritizedChannel};
+use crate::{preview::Preview, utils::PixiSpanned, PrioritizedChannel, Targets};
 
 /// Describes the contents of the `[workspace]` section of the project manifest.
 #[derive(Debug, Clone)]
@@ -62,5 +62,5 @@ pub struct Workspace {
     pub preview: Preview,
 
     /// Build variants
-    pub build_variants: Option<HashMap<String, Vec<String>>>,
+    pub build_variants: Targets<Option<HashMap<String, Vec<String>>>>,
 }

src/build/mod.rs

@@ -26,6 +26,7 @@ use pixi_build_types::{
 use pixi_config::get_cache_dir;
 pub use pixi_glob::{GlobHashCache, GlobHashError};
 use pixi_glob::{GlobHashKey, GlobModificationTime, GlobModificationTimeError};
+use pixi_manifest::Targets;
 use pixi_record::{InputHash, PinnedPathSpec, PinnedSourceSpec, SourceRecord};
 use pixi_spec::SourceSpec;
 use rattler_conda_types::{
@@ -54,7 +55,7 @@ pub struct BuildContext {
     cache_dir: PathBuf,
     work_dir: PathBuf,
     tool_context: Arc<ToolContext>,
-    variant_config: Option<HashMap<String, Vec<String>>>,
+    variant_config: Targets<Option<HashMap<String, Vec<String>>>>,
 }
 
 #[derive(Debug, Error, Diagnostic)]
@@ -117,7 +118,7 @@ impl BuildContext {
         cache_dir: PathBuf,
         dot_pixi_dir: PathBuf,
         channel_config: ChannelConfig,
-        variant_config: Option<HashMap<String, Vec<String>>>,
+        variant_config: Targets<Option<HashMap<String, Vec<String>>>>,
         tool_context: Arc<ToolContext>,
     ) -> Result<Self, std::io::Error> {
         Ok(Self {
@@ -133,16 +134,18 @@ impl BuildContext {
     }
 
     pub fn from_project(project: &crate::project::Project) -> miette::Result<Self> {
+        let variant = project
+            .manifest()
+            .workspace
+            .workspace
+            .build_variants
+            .clone();
+
         Self::new(
             get_cache_dir()?,
             project.pixi_dir(),
             project.channel_config(),
-            project
-                .manifest()
-                .workspace
-                .workspace
-                .build_variants
-                .clone(),
+            variant,
             Arc::new(ToolContext::default()),
         )
         .into_diagnostic()
@@ -163,6 +166,22 @@ impl BuildContext {
         }
     }
 
+    fn resolve_variant(&self, platform: Platform) -> HashMap<String, Vec<String>> {
+        let mut result = HashMap::new();
+        for item in self.variant_config.resolve(Some(platform)) {
+            if let Some(variants) = item {
+                result.extend(variants.clone());
+            }
+        }
+        tracing::info!(
+            "resolved variant configuration for {}: {:?}",
+            platform,
+            result
+        );
+
+        result
+    }
+
     /// Extracts the metadata for a package from the given source specification.
     #[allow(clippy::too_many_arguments)]
     pub async fn extract_source_metadata(
@@ -319,7 +338,7 @@ impl BuildContext {
                         }
                         .key(),
                     ),
-                    variant_configuration: self.variant_config.clone(),
+                    variant_configuration: Some(self.resolve_variant(host_platform)),
                 },
                 build_reporter.as_conda_build_reporter(),
             )
@@ -558,7 +577,7 @@ impl BuildContext {
                         }
                         .key(),
                     ),
-                    variant_configuration: self.variant_config.clone(),
+                    variant_configuration: Some(self.resolve_variant(host_platform)),
                 },
                 metadata_reporter.as_conda_metadata_reporter().clone(),
             )