diff options
author | Oliver Reiche <oliver.reiche@huawei.com> | 2025-06-23 12:00:03 +0200 |
---|---|---|
committer | Oliver Reiche <oliver.reiche@huawei.com> | 2025-06-24 12:56:57 +0200 |
commit | c49f9e8a16997d7dc4cad691a249741146101be0 (patch) | |
tree | 8e3112e5831a13ce1558bc039ea8ca85f42a8799 /src/buildtool/main | |
parent | 778656381c8c05d88453140612b4053dbc2ce787 (diff) | |
download | justbuild-c49f9e8a16997d7dc4cad691a249741146101be0.tar.gz |
ExecutionService: Use LocalApi directly
Diffstat (limited to 'src/buildtool/main')
-rw-r--r-- | src/buildtool/main/TARGETS | 2 | ||||
-rw-r--r-- | src/buildtool/main/main.cpp | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS index 86ea56a9..72ff2df7 100644 --- a/src/buildtool/main/TARGETS +++ b/src/buildtool/main/TARGETS @@ -42,11 +42,13 @@ , ["src/buildtool/computed_roots", "evaluate"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/common", "api_bundle"] + , ["src/buildtool/execution_api/common", "common"] , [ "src/buildtool/execution_api/execution_service" , "server_implementation" ] , ["src/buildtool/execution_api/local", "config"] , ["src/buildtool/execution_api/local", "context"] + , ["src/buildtool/execution_api/local", "local_api"] , ["src/buildtool/execution_api/remote", "config"] , ["src/buildtool/execution_api/remote", "context"] , ["src/buildtool/execution_engine/executor", "context"] diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index d13ad2e7..798336b3 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -51,6 +51,7 @@ #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_config.hpp" @@ -86,6 +87,7 @@ #include "src/buildtool/execution_api/execution_service/server_implementation.hpp" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/execution_api/local/context.hpp" +#include "src/buildtool/execution_api/local/local_api.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/execution_api/remote/context.hpp" #include "src/buildtool/execution_engine/executor/context.hpp" @@ -827,10 +829,11 @@ auto main(int argc, char* argv[]) -> int { &remote_context, /*repo_config=*/nullptr); - return execution_server->Run(&local_context, - &remote_context, - exec_apis, - arguments.service.op_exponent) + return execution_server->Run( + &local_context, + &remote_context, + dynamic_cast<LocalApi const*>(&*exec_apis.local), + arguments.service.op_exponent) ? kExitSuccess : kExitFailure; } |