From 95b3fcb09e94ac9f114509b205903b25a2bbd3ba Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Mon, 3 Apr 2023 16:38:54 +0200 Subject: Make git root part of the storage config In this way, we have the whole layout of the local build root consolidated in one place. Moreover, in this way, the location of the git root is also available to the build tool itself and can, e.g., be used as fallback CAS. --- src/other_tools/root_maps/fpath_git_map.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/other_tools/root_maps/fpath_git_map.cpp') diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp index d8de9fa1..1330ee99 100644 --- a/src/other_tools/root_maps/fpath_git_map.cpp +++ b/src/other_tools/root_maps/fpath_git_map.cpp @@ -15,6 +15,7 @@ #include "src/other_tools/root_maps/fpath_git_map.hpp" #include "src/buildtool/execution_api/local/config.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/other_tools/just_mr/utils.hpp" #include "src/utils/cpp/tmp_dir.hpp" @@ -163,7 +164,7 @@ auto CreateFilePathGitMap( std::string tree = values[0]->first; // set the workspace root (*setter)(nlohmann::json::array( - {"git tree", tree, JustMR::Utils::GetGitCacheRoot()})); + {"git tree", tree, StorageConfig::GitRoot()})); }, [logger, target_path = key](auto const& msg, bool fatal) { (*logger)( -- cgit v1.2.3