Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5132670
Fix library mapping in linking checks
zelosleone Jun 11, 2025
5a7584e
white lines of recipes
zelosleone Jun 11, 2025
012691e
dynamical instead of harcoded
zelosleone Jun 23, 2025
91a5277
further refining for dynamical approach
zelosleone Jun 23, 2025
c04499a
first step
zelosleone Jun 24, 2025
b495463
shallow merge
zelosleone Jul 3, 2025
9127dfd
Merge main: Add Ruby/Node.js tests while preserving cache linking tests
zelosleone Jul 3, 2025
475e8f6
merge fix
zelosleone Jul 3, 2025
cec07d0
for macos we remove paths and just use filenames
zelosleone Jul 3, 2025
1f406ad
fmt
zelosleone Jul 3, 2025
4a3e581
windows
zelosleone Jul 3, 2025
e042df3
.
zelosleone Jul 3, 2025
f1c12af
this will be a test (passes on local with vs2022)
zelosleone Jul 4, 2025
3166e2a
time to get both platforms
zelosleone Jul 4, 2025
555ff76
go
zelosleone Jul 4, 2025
992a2e7
pixi lock
zelosleone Jul 4, 2025
33b0670
some cleanup trying
zelosleone Jul 4, 2025
1de2377
lets try like this
zelosleone Jul 4, 2025
8ff0b99
LAST HOPEFULLY
zelosleone Jul 4, 2025
de0db43
cargo clippy for unix/windows file permission and test update (it pas…
zelosleone Jul 4, 2025
0b07d22
some cleanups
zelosleone Jul 7, 2025
e79868e
post process mappings with sysroot packages only
zelosleone Jul 7, 2025
aef501a
all host libraries but only sysroot from build
zelosleone Jul 7, 2025
9b57549
performance improvements with collecting library fiile names once
zelosleone Jul 7, 2025
c28c445
single lookup
zelosleone Jul 7, 2025
ebff2c5
back to ascii cases
zelosleone Jul 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ pub async fn run_build(
.into_diagnostic()?
};

let output = output
let mut output = output
.resolve_dependencies(tool_configuration)
.await
.into_diagnostic()?;
Expand Down
23 changes: 18 additions & 5 deletions src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ use crate::{
parser::{Dependency, Requirements, Source},
},
render::resolved_dependencies::{
FinalizedDependencies, install_environments, resolve_dependencies,
FinalizedDependencies, install_environments, populate_library_mappings,
resolve_dependencies,
},
source::{
copy_dir::{CopyDir, CopyOptions, copy_file},
Expand Down Expand Up @@ -218,14 +219,26 @@ impl Output {
.into_diagnostic()
.context("failed to reindex output channel")?;

let finalized_dependencies =
let mut finalized_dependencies =
resolve_dependencies(&cache.requirements, &self, &channels, tool_configuration)
.await
.unwrap();

install_environments(&self, &finalized_dependencies, tool_configuration)
.await
.into_diagnostic()?;
install_environments(
&self.build_configuration,
&finalized_dependencies,
tool_configuration,
)
.await
.into_diagnostic()?;

// Populate library mappings after packages are installed
populate_library_mappings(
&mut finalized_dependencies,
&self.build_configuration.directories.build_prefix,
&self.build_configuration.directories.host_prefix,
)
.into_diagnostic()?;

let selector_config = self.build_configuration.selector_config();
let mut jinja = Jinja::new(selector_config.clone());
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ pub async fn debug_recipe(
.recreate_directories()
.into_diagnostic()?;
let output = output.fetch_sources(&tool_config).await.into_diagnostic()?;
let output = output
let mut output = output
.resolve_dependencies(&tool_config)
.await
.into_diagnostic()?;
Expand Down
2 changes: 2 additions & 0 deletions src/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ mod test {
};
use rattler_digest::{Md5, Sha256, parse_digest_from_hex};
use rstest::*;
use std::collections::HashMap;
use std::str::FromStr;
use url::Url;

Expand Down Expand Up @@ -893,6 +894,7 @@ mod test {
.unwrap(),
channel: Some("test".into()),
}],
library_mapping: HashMap::new(),
};

// test yaml roundtrip
Expand Down
Loading
Loading