summaryrefslogtreecommitdiff
path: root/src/buildtool/execution_api/local/local_action.cpp
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-08-29 13:49:58 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2024-08-30 17:17:09 +0200
commitace40adf1ed751072bc858d40c08f8f56340b592 (patch)
tree5196e496cd238b9c60ac8bf6c9df59ae1ea1e9ba /src/buildtool/execution_api/local/local_action.cpp
parent0df9bfcbcda9f87097bd313819be0be2cf5fa892 (diff)
downloadjustbuild-ace40adf1ed751072bc858d40c08f8f56340b592.tar.gz
Replace bazel_re::Digest in LocalAC
...with ArtifactDigest.
Diffstat (limited to 'src/buildtool/execution_api/local/local_action.cpp')
-rw-r--r--src/buildtool/execution_api/local/local_action.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp
index 8cc1d242..ad106c6f 100644
--- a/src/buildtool/execution_api/local/local_action.cpp
+++ b/src/buildtool/execution_api/local/local_action.cpp
@@ -21,6 +21,7 @@
#include <system_error>
#include <utility>
+#include "src/buildtool/common/artifact_digest.hpp"
#include "src/buildtool/common/bazel_types.hpp"
#include "src/buildtool/compatibility/native_support.hpp"
#include "src/buildtool/execution_api/common/tree_reader.hpp"
@@ -104,8 +105,9 @@ auto LocalAction::Execute(Logger const* logger) noexcept
}
if (do_cache) {
+ ArtifactDigest const a_digest{*action};
if (auto result =
- local_context_.storage->ActionCache().CachedResult(*action)) {
+ local_context_.storage->ActionCache().CachedResult(a_digest)) {
if (result->exit_code() == 0 and
ActionResultContainsExpectedOutputs(
*result, output_files_, output_dirs_)) {
@@ -190,8 +192,9 @@ auto LocalAction::Run(bazel_re::Digest const& action_id) const noexcept
if (CollectAndStoreOutputs(&result.action, build_root / cwd_)) {
if (cache_flag_ == CacheFlag::CacheOutput) {
+ ArtifactDigest const a_digest{action_id};
if (not local_context_.storage->ActionCache().StoreResult(
- action_id, result.action)) {
+ a_digest, result.action)) {
logger_.Emit(LogLevel::Warning,
"failed to store action results");
}