diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2025-05-23 11:43:07 +0200 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2025-06-04 14:34:44 +0200 |
| commit | e5010e47df602404d332d9686c04fa12358e3644 (patch) | |
| tree | 7a4e92afd9186f0206a726a3c45d8d0be9cd1cce /src/buildtool/computed_roots/evaluate.cpp | |
| parent | ed25b0f77690abe1f04e4cdcb284b7e17208d169 (diff) | |
| download | justbuild-e5010e47df602404d332d9686c04fa12358e3644.tar.gz | |
FileRoot: Give git-based roots access to storage config
Diffstat (limited to 'src/buildtool/computed_roots/evaluate.cpp')
| -rw-r--r-- | src/buildtool/computed_roots/evaluate.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/buildtool/computed_roots/evaluate.cpp b/src/buildtool/computed_roots/evaluate.cpp index a5155593..d4995baa 100644 --- a/src/buildtool/computed_roots/evaluate.cpp +++ b/src/buildtool/computed_roots/evaluate.cpp @@ -241,8 +241,8 @@ void ComputeAndFill( "Root {} taken from cache to be {}", target.ToString(), root); - auto root_result = - FileRoot::FromGit(storage_config->GitRoot(), root); + auto root_result = FileRoot::FromGit( + storage_config, storage_config->GitRoot(), root); if (not root_result) { (*logger)(fmt::format("Failed to create git root for {}", root), /*fatal=*/true); @@ -345,7 +345,8 @@ void ComputeAndFill( target.ToString(), *result, log_desc); - auto root_result = FileRoot::FromGit(storage_config->GitRoot(), *result); + auto root_result = + FileRoot::FromGit(storage_config, storage_config->GitRoot(), *result); if (not root_result) { (*logger)(fmt::format("Failed to create git root for {}", *result), /*fatal=*/true); @@ -609,7 +610,8 @@ void ComputeAndFill( } if (local_tree_structure.has_value()) { - auto resolved_root = FileRoot::FromGit(native_storage_config.GitRoot(), + auto resolved_root = FileRoot::FromGit(storage_config, + native_storage_config.GitRoot(), local_tree_structure->hash()); if (not resolved_root) { return unexpected{ |