summaryrefslogtreecommitdiff
path: root/src/buildtool/execution_api
diff options
context:
space:
mode:
Diffstat (limited to 'src/buildtool/execution_api')
-rw-r--r--src/buildtool/execution_api/bazel_msg/bazel_blob.hpp3
-rw-r--r--src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp6
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_network.cpp6
-rw-r--r--src/buildtool/execution_api/remote/bazel/bazel_response.cpp2
4 files changed, 9 insertions, 8 deletions
diff --git a/src/buildtool/execution_api/bazel_msg/bazel_blob.hpp b/src/buildtool/execution_api/bazel_msg/bazel_blob.hpp
index 524e2fc8..5e92a393 100644
--- a/src/buildtool/execution_api/bazel_msg/bazel_blob.hpp
+++ b/src/buildtool/execution_api/bazel_msg/bazel_blob.hpp
@@ -39,7 +39,8 @@ struct BazelBlob {
if (not content.has_value()) {
return std::nullopt;
}
- return BazelBlob{ArtifactDigest::Create(*content), *content};
+ return BazelBlob{ArtifactDigest::Create<ObjectType::File>(*content),
+ *content};
}
#endif // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_BAZEL_MSG_BAZEL_BLOB_HPP
diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
index da1d6554..a9022e55 100644
--- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
+++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
@@ -274,7 +274,7 @@ template <class T>
auto msg = CreateDirectoryNode(dir_name);
auto content_creator = [&dir] { return SerializeMessage(dir); };
auto digest_creator = [](std::string const& content) -> bazel_re::Digest {
- return ArtifactDigest::Create(content);
+ return ArtifactDigest::Create<ObjectType::File>(content);
};
return DirectoryNodeBundle::Create(msg, content_creator, digest_creator);
}
@@ -305,7 +305,7 @@ template <class T>
auto content_creator = [&msg] { return SerializeMessage(msg); };
auto digest_creator = [](std::string const& content) -> bazel_re::Digest {
- return ArtifactDigest::Create(content);
+ return ArtifactDigest::Create<ObjectType::File>(content);
};
return CommandBundle::Create(msg, content_creator, digest_creator);
@@ -341,7 +341,7 @@ template <class T>
auto content_creator = [&msg] { return SerializeMessage(msg); };
auto digest_creator = [](std::string const& content) -> bazel_re::Digest {
- return ArtifactDigest::Create(content);
+ return ArtifactDigest::Create<ObjectType::File>(content);
};
return ActionBundle::Create(msg, content_creator, digest_creator);
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
index 0252328b..5bf254e1 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp
@@ -269,9 +269,9 @@ auto BazelNetwork::RecursivelyReadTreeLeafs(
dir_map->reserve(dirs.size());
for (auto& dir : dirs) {
try {
- dir_map->emplace(
- ArtifactDigest::Create(dir.SerializeAsString()),
- std::move(dir));
+ dir_map->emplace(ArtifactDigest::Create<ObjectType::File>(
+ dir.SerializeAsString()),
+ std::move(dir));
} catch (...) {
return 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 97fae4f9..615c0177 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
@@ -24,7 +24,7 @@ namespace {
auto ProcessDirectoryMessage(bazel_re::Directory const& dir) noexcept
-> std::optional<BazelBlob> {
auto data = dir.SerializeAsString();
- auto digest = ArtifactDigest::Create(data);
+ auto digest = ArtifactDigest::Create<ObjectType::File>(data);
return BazelBlob{std::move(digest), std::move(data)};
}