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/build_utils.hpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/buildtool/main/build_utils.hpp') diff --git a/src/buildtool/main/build_utils.hpp b/src/buildtool/main/build_utils.hpp index af99d6a0..961b5c09 100644 --- a/src/buildtool/main/build_utils.hpp +++ b/src/buildtool/main/build_utils.hpp @@ -27,9 +27,9 @@ #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/storage/target_cache_key.hpp" #ifndef BOOTSTRAP_BUILD_TOOL -#include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" +#include "src/buildtool/execution_api/common/api_bundle.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" @@ -70,8 +70,7 @@ using TargetCacheWriterMap = std::unordered_map const& extra_infos, std::size_t jobs, - gsl::not_null const& local_api, - gsl::not_null const& remote_api, + gsl::not_null const& apis, TargetCacheWriteStrategy strategy = TargetCacheWriteStrategy::Sync, TargetCache const& tc = Storage::Instance().TargetCache()) -> TargetCacheWriterMap; @@ -89,8 +88,7 @@ void WriteTargetCacheEntries( std::unordered_map const& extra_infos, std::size_t jobs, - gsl::not_null const& local_api, - gsl::not_null const& remote_api, + ApiBundle const& apis, TargetCacheWriteStrategy strategy = TargetCacheWriteStrategy::Sync, TargetCache const& tc = Storage::Instance().TargetCache(), Logger const* logger = nullptr, -- cgit v1.2.3