From 952c60a8ecc4318fbd20a01fe642b6629ddf42cc Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Wed, 29 Jan 2025 16:49:02 +0100 Subject: CommonApi: Remove template parameter from UploadAndUpdateContainer ...since it works with ArtifactBlobs only. --- .../execution_api/remote/bazel/bazel_response.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/buildtool/execution_api/remote/bazel/bazel_response.cpp') diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp index e4bc9248..19e7b972 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp @@ -294,11 +294,10 @@ auto BazelResponse::UploadTreeMessageDirectories( } auto const root_digest = rootdir_blob->digest; // store or upload rootdir blob, taking maximum transfer size into account - if (not UpdateContainerAndUpload( - &dir_blobs, - *std::move(rootdir_blob), - /*exception_is_fatal=*/false, - upload_callback)) { + if (not UpdateContainerAndUpload(&dir_blobs, + *std::move(rootdir_blob), + /*exception_is_fatal=*/false, + upload_callback)) { return unexpected{fmt::format( "failed to upload Tree with root digest {}", root_digest.hash())}; } @@ -310,11 +309,10 @@ auto BazelResponse::UploadTreeMessageDirectories( return unexpected{std::move(blob).error()}; } auto const blob_digest = blob->digest; - if (not UpdateContainerAndUpload( - &dir_blobs, - *std::move(blob), - /*exception_is_fatal=*/false, - upload_callback)) { + if (not UpdateContainerAndUpload(&dir_blobs, + *std::move(blob), + /*exception_is_fatal=*/false, + upload_callback)) { return unexpected{ fmt::format("failed to upload Tree subdir with digest {}", blob_digest.hash())}; -- cgit v1.2.3