Skip to content

Commit 380ea89

Browse files
committed
fix: pixi build
1 parent 861c878 commit 380ea89

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/pixi-build/src/bin/pixi-build-python/python.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use pixi_build_backend::{
88
};
99
use pixi_build_types::{
1010
procedures::{
11-
conda_build::{CondaBuildParams, CondaBuildResult},
11+
conda_build::{CondaBuildParams, CondaBuildResult, CondaBuiltPackage},
1212
conda_metadata::{CondaMetadataParams, CondaMetadataResult},
1313
initialize::{InitializeParams, InitializeResult},
1414
},
@@ -470,13 +470,19 @@ impl Protocol for PythonBuildBackend {
470470
.finish();
471471

472472
let temp_recipe = TemporaryRenderedRecipe::from_output(&output)?;
473-
let (_output, package) = temp_recipe
473+
let (output, package) = temp_recipe
474474
.within_context_async(move || async move { run_build(output, &tool_config).await })
475475
.await?;
476476

477477
Ok(CondaBuildResult {
478-
output_file: package,
479-
input_globs: input_globs(),
478+
packages: vec![CondaBuiltPackage {
479+
output_file: package,
480+
input_globs: input_globs(),
481+
name: output.name().as_normalized().to_string(),
482+
version: output.version().to_string(),
483+
build: output.build_string().into_owned(),
484+
subdir: output.target_platform().to_string(),
485+
}],
480486
})
481487
}
482488
}

crates/pixi-build/src/cli.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use clap_verbosity_flag::{InfoLevel, Verbosity};
55
use miette::IntoDiagnostic;
66
use pixi_build_types::{
77
procedures::{
8-
conda_build::{CondaBuildParams, CondaOutputIdentifier},
8+
conda_build::CondaBuildParams,
99
conda_metadata::{CondaMetadataParams, CondaMetadataResult},
1010
initialize::InitializeParams,
1111
},
@@ -134,14 +134,16 @@ async fn build(factory: impl ProtocolFactory, manifest_path: &Path) -> miette::R
134134
channel_configuration: ChannelConfiguration {
135135
base_url: channel_config.channel_alias,
136136
},
137-
output: CondaOutputIdentifier::default(),
137+
outputs: None,
138138
})
139139
.await?;
140140

141-
eprintln!("Successfully build '{}'", result.output_file.display());
142-
eprintln!("Use following globs to revalidate: ");
143-
for glob in result.input_globs {
144-
eprintln!(" - {}", glob);
141+
for package in result.packages {
142+
eprintln!("Successfully build '{}'", package.output_file.display());
143+
eprintln!("Use following globs to revalidate: ");
144+
for glob in package.input_globs {
145+
eprintln!(" - {}", glob);
146+
}
145147
}
146148

147149
Ok(())

0 commit comments

Comments
 (0)