From 4392b0de9b77d750f4c531c167ab008237cfde1a Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Thu, 20 Jun 2024 11:42:05 +0200 Subject: Pass ApiBundle to add-to-cas and install-cas --- src/buildtool/main/main.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/buildtool/main/main.cpp') diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index 6f9c68ad..294405e3 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -912,13 +912,12 @@ auto main(int argc, char* argv[]) -> int { "Failed set Git CAS {}.", StorageConfig::GitRoot().string()); } - return FetchAndInstallArtifacts( - &*main_apis.remote, &*main_apis.local, arguments.fetch) + return FetchAndInstallArtifacts(main_apis, arguments.fetch) ? kExitSuccess : kExitFailure; } if (arguments.cmd == SubCommand::kAddToCas) { - return AddArtifactsToCas(arguments.to_add, &*main_apis.remote) + return AddArtifactsToCas(arguments.to_add, main_apis) ? kExitSuccess : kExitFailure; } @@ -1105,8 +1104,7 @@ auto main(int argc, char* argv[]) -> int { cache_targets, build_result->extra_infos, jobs, - &*main_apis.local, - &*main_apis.remote, + main_apis, arguments.tc.target_cache_write_strategy, Storage::Instance().TargetCache(), nullptr, -- cgit v1.2.3