Skip to content

Commit

Permalink
make things compile for now
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfv committed Oct 21, 2024
1 parent aff30bf commit ac98f93
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/variant_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1177,4 +1177,4 @@ mod tests {

insta::assert_yaml_snapshot!(used_variables_all);
}
}
}
23 changes: 14 additions & 9 deletions src/variant_render.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
use std::collections::{BTreeMap, HashSet};

use crate::{
hash::HashInfo, recipe::{
hash::HashInfo,
recipe::{
custom_yaml::Node,
parser::{Dependency, PinCompatible, PinSubpackage},
ParsingError, Recipe,
}, selectors::SelectorConfig, used_variables::used_vars_from_expressions, variant_config::{ParseErrors, VariantConfig, VariantError}
},
selectors::SelectorConfig,
used_variables::used_vars_from_expressions,
variant_config::{ParseErrors, VariantConfig, VariantError},
};

/// All the raw outputs of a single recipe.yaml
Expand Down Expand Up @@ -120,7 +124,7 @@ pub(crate) fn stage_1_render(
variant_config: &VariantConfig,
) -> Result<Vec<Stage1Render>, VariantError> {
let mut stage_1_renders = Vec::new();
let mut discovered_outputs = Vec::new();
// let mut discovered_outputs = Vec::new();

// TODO we need to add variables from the cache here!
for r in stage0_renders {
Expand Down Expand Up @@ -155,13 +159,14 @@ pub(crate) fn stage_1_render(
}
}

let hash = HashInfo::from_variant(&used_filtered, parsed_recipe.build().noarch());
// TODO
// let hash = HashInfo::from_variant(&used_filtered, parsed_recipe.build().noarch());

let build_string = parsed_recipe
.build()
.string()
.resolve(&hash, parsed_recipe.build().number)
.into_owned();
// let build_string = parsed_recipe
// .build()
// .string()
// .resolve(&hash, parsed_recipe.build().number)
// .into_owned();

extra_vars_per_output.push(additional_variables);
}
Expand Down

0 comments on commit ac98f93

Please sign in to comment.