diff options
Diffstat (limited to 'src/buildtool/execution_api/remote/bazel')
-rw-r--r-- | src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp | 5 | ||||
-rw-r--r-- | src/buildtool/execution_api/remote/bazel/bazel_response.cpp | 19 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp index a528eecb..7f683132 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp @@ -47,8 +47,9 @@ class BazelExecutionClient { std::optional<ExecutionOutput> output{std::nullopt}; static auto MakeEmptyFailed() -> ExecutionResponse { - return ExecutionResponse{ - {}, ExecutionResponse::State::Failed, std::nullopt}; + return ExecutionResponse{.execution_handle = {}, + .state = ExecutionResponse::State::Failed, + .output = std::nullopt}; } }; diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp index d45d9aa1..9889d8ed 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp @@ -51,11 +51,12 @@ auto BazelResponse::Artifacts() const noexcept -> ArtifactInfos { // collect files and store them for (auto const& file : action_result.output_files()) { try { - artifacts.emplace(file.path(), - Artifact::ObjectInfo{ - ArtifactDigest{file.digest()}, - file.is_executable() ? ObjectType::Executable - : ObjectType::File}); + artifacts.emplace( + file.path(), + Artifact::ObjectInfo{.digest = ArtifactDigest{file.digest()}, + .type = file.is_executable() + ? ObjectType::Executable + : ObjectType::File}); } catch (...) { return {}; } @@ -68,8 +69,9 @@ auto BazelResponse::Artifacts() const noexcept -> ArtifactInfos { try { artifacts.emplace( tree.path(), - Artifact::ObjectInfo{ArtifactDigest{tree.tree_digest()}, - ObjectType::Tree}); + Artifact::ObjectInfo{ + .digest = ArtifactDigest{tree.tree_digest()}, + .type = ObjectType::Tree}); } catch (...) { return {}; } @@ -109,7 +111,8 @@ auto BazelResponse::Artifacts() const noexcept -> ArtifactInfos { } artifacts.emplace( action_result.output_directories(pos).path(), - Artifact::ObjectInfo{*root_digest, ObjectType::Tree}); + Artifact::ObjectInfo{.digest = *root_digest, + .type = ObjectType::Tree}); } catch (...) { return {}; } |