Skip to content

Commit

Permalink
Bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
coenm committed Sep 7, 2023
1 parent b8b536a commit 8631b52
Showing 1 changed file with 16 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -223,32 +223,33 @@ List<EvaluatedVariable> EvaluateVariables(IEnumerable<Variable>? vars)
continue;
}

// todo redirect

try
{
repoSpecificConfig = _repositoryActionsFileStore.TryGet(filename);
repoSpecificConfig = _repositoryActionsFileStore.TryGet(f);
}
catch (Exception)
{
// warning.
}
}

List<EvaluatedVariable> 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<EvaluatedVariable> 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);
Expand Down

0 comments on commit 8631b52

Please sign in to comment.