From 8631b520d804f805aedf9c79d5dd1738e0420c32 Mon Sep 17 00:00:00 2001 From: Coen van den Munckhof Date: Thu, 7 Sep 2023 16:45:48 +0200 Subject: [PATCH] Bugfix --- .../RepositorySpecificConfiguration.cs | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/RepoM.Api/IO/ModuleBasedRepositoryActionProvider/RepositorySpecificConfiguration.cs b/src/RepoM.Api/IO/ModuleBasedRepositoryActionProvider/RepositorySpecificConfiguration.cs index b81666a2..f2e7b6ab 100644 --- a/src/RepoM.Api/IO/ModuleBasedRepositoryActionProvider/RepositorySpecificConfiguration.cs +++ b/src/RepoM.Api/IO/ModuleBasedRepositoryActionProvider/RepositorySpecificConfiguration.cs @@ -223,11 +223,9 @@ List EvaluateVariables(IEnumerable? vars) continue; } - // todo redirect - try { - repoSpecificConfig = _repositoryActionsFileStore.TryGet(filename); + repoSpecificConfig = _repositoryActionsFileStore.TryGet(f); } catch (Exception) { @@ -235,20 +233,23 @@ List EvaluateVariables(IEnumerable? vars) } } - List list2 = EvaluateVariables(repoSpecificConfig?.Variables); - variables.AddRange(list2); - using IDisposable repoSpecificVariables = RepoMVariableProviderStore.Push(list2); - - actions.Add(rootFile.ActionsCollection); - if (repoSpecificConfig?.ActionsCollection != null) + if (repoSpecificConfig != null) { - actions.Add(repoSpecificConfig.ActionsCollection); - } + List list2 = EvaluateVariables(repoSpecificConfig.Variables); + variables.AddRange(list2); + using IDisposable repoSpecificVariables = RepoMVariableProviderStore.Push(list2); - tags.Add(rootFile.TagsCollection); - if (repoSpecificConfig?.TagsCollection != null) - { - tags.Add(repoSpecificConfig.TagsCollection); + actions.Add(rootFile.ActionsCollection); + if (repoSpecificConfig.ActionsCollection != null) + { + actions.Add(repoSpecificConfig.ActionsCollection); + } + + tags.Add(rootFile.TagsCollection); + if (repoSpecificConfig.TagsCollection != null) + { + tags.Add(repoSpecificConfig.TagsCollection); + } } return (envVars, variables, actions, tags);