diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtool/main/TARGETS | 2 | ||||
| -rw-r--r-- | src/buildtool/main/add_to_cas.cpp | 9 | ||||
| -rw-r--r-- | src/buildtool/main/add_to_cas.hpp | 2 | ||||
| -rw-r--r-- | src/buildtool/main/main.cpp | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS index e90c9ae9..5e8e457b 100644 --- a/src/buildtool/main/TARGETS +++ b/src/buildtool/main/TARGETS @@ -141,6 +141,7 @@ , "deps": [ ["src/buildtool/common", "cli"] , ["src/buildtool/execution_api/common", "api_bundle"] + , ["src/buildtool/storage", "storage"] ] , "private-deps": [ ["src/buildtool/compatibility", "compatibility"] @@ -149,7 +150,6 @@ , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] - , ["src/buildtool/storage", "storage"] ] , "stage": ["src", "buildtool", "main"] } diff --git a/src/buildtool/main/add_to_cas.cpp b/src/buildtool/main/add_to_cas.cpp index b7d79997..7a20af65 100644 --- a/src/buildtool/main/add_to_cas.cpp +++ b/src/buildtool/main/add_to_cas.cpp @@ -27,12 +27,11 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" -#include "src/buildtool/storage/storage.hpp" -auto AddArtifactsToCas(ToAddArguments const& clargs, ApiBundle const& apis) - -> bool { - - auto const& cas = Storage::Instance().CAS(); +auto AddArtifactsToCas(ToAddArguments const& clargs, + Storage const& storage, + ApiBundle const& apis) -> bool { + auto const& cas = storage.CAS(); std::optional<bazel_re::Digest> digest{}; auto object_location = clargs.location; diff --git a/src/buildtool/main/add_to_cas.hpp b/src/buildtool/main/add_to_cas.hpp index 6dd20236..b7b25bb7 100644 --- a/src/buildtool/main/add_to_cas.hpp +++ b/src/buildtool/main/add_to_cas.hpp @@ -18,8 +18,10 @@ #include "src/buildtool/common/cli.hpp" #include "src/buildtool/execution_api/common/api_bundle.hpp" +#include "src/buildtool/storage/storage.hpp" [[nodiscard]] auto AddArtifactsToCas(ToAddArguments const& clargs, + Storage const& storage, ApiBundle const& apis) -> bool; #endif diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index 293c8002..80b7ea14 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -905,7 +905,8 @@ auto main(int argc, char* argv[]) -> int { : kExitFailure; } if (arguments.cmd == SubCommand::kAddToCas) { - return AddArtifactsToCas(arguments.to_add, main_apis) + return AddArtifactsToCas( + arguments.to_add, Storage::Instance(), main_apis) ? kExitSuccess : kExitFailure; } |