From ac98f931fbc9df5f663f722c9085b06a9eaf7d9a Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Mon, 21 Oct 2024 11:33:15 +0200 Subject: [PATCH] make things compile for now --- src/variant_config.rs | 2 +- src/variant_render.rs | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/variant_config.rs b/src/variant_config.rs index 35e2ff002..b5fb49476 100644 --- a/src/variant_config.rs +++ b/src/variant_config.rs @@ -1177,4 +1177,4 @@ mod tests { insta::assert_yaml_snapshot!(used_variables_all); } -} \ No newline at end of file +} diff --git a/src/variant_render.rs b/src/variant_render.rs index 4f9b39f72..2ea3beca6 100644 --- a/src/variant_render.rs +++ b/src/variant_render.rs @@ -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 @@ -120,7 +124,7 @@ pub(crate) fn stage_1_render( variant_config: &VariantConfig, ) -> Result, 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 { @@ -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); }