diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-02 17:55:35 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-09 13:07:13 +0200 |
| commit | 56f91aac0c25e6e80dbaae087227502312accee6 (patch) | |
| tree | 98996ba1159a492d2ec7e0a0d8116722215e36f1 /src/buildtool/execution_api/local/local_action.hpp | |
| parent | e8d9f711ab3bc67c2ee64fae427b45b63dc47284 (diff) | |
| download | justbuild-56f91aac0c25e6e80dbaae087227502312accee6.tar.gz | |
Return ArtifactDigest from CreateActionDigestFromCommandLine
Diffstat (limited to 'src/buildtool/execution_api/local/local_action.hpp')
| -rw-r--r-- | src/buildtool/execution_api/local/local_action.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/buildtool/execution_api/local/local_action.hpp b/src/buildtool/execution_api/local/local_action.hpp index 8cc12aba..dedc2951 100644 --- a/src/buildtool/execution_api/local/local_action.hpp +++ b/src/buildtool/execution_api/local/local_action.hpp @@ -25,6 +25,8 @@ #include <vector> #include "gsl/gsl" +#include "src/buildtool/common/artifact_digest.hpp" +#include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/execution_action.hpp" #include "src/buildtool/execution_api/common/execution_response.hpp" @@ -97,11 +99,10 @@ class LocalAction final : public IExecutionAction { [[nodiscard]] auto CreateActionDigest(ArtifactDigest const& exec_dir, bool do_not_cache) - -> std::optional<bazel_re::Digest> { + -> std::optional<ArtifactDigest> { auto const env_vars = BazelMsgFactory::CreateMessageVectorFromMap< bazel_re::Command_EnvironmentVariable>(env_vars_); - auto const bazel_exec_dir = static_cast<bazel_re::Digest>(exec_dir); BazelMsgFactory::ActionDigestRequest request{ .command_line = &cmdline_, .cwd = &cwd_, @@ -109,7 +110,7 @@ class LocalAction final : public IExecutionAction { .output_dirs = &output_dirs_, .env_vars = &env_vars, .properties = &properties_, - .exec_dir = &bazel_exec_dir, + .exec_dir = &exec_dir, .hash_function = local_context_.storage_config->hash_function, .timeout = timeout_, .skip_action_cache = do_not_cache}; |