diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-09-21 18:19:58 +0200 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-09-22 11:16:21 +0200 |
| commit | 9ef2ffa9acdc19453c81696aa2ed4da7cb84078c (patch) | |
| tree | a27019dd1ffbee4c1a37fc2e6fd8a3e4a5ce62d0 /src/buildtool/serve_api/serve_service/source_tree.hpp | |
| parent | 1ac49337bdb752e42bc1bb6cb2e02fa6bb554462 (diff) | |
| download | justbuild-9ef2ffa9acdc19453c81696aa2ed4da7cb84078c.tar.gz | |
RemoteServeConfig: Remove problematic inheritance
This was causing the remote serve address to overwrite the one set
for remote execution.
Also, to keep things clean, some common remote server-related
methods and definitions were moved into their own library.
Diffstat (limited to 'src/buildtool/serve_api/serve_service/source_tree.hpp')
| -rw-r--r-- | src/buildtool/serve_api/serve_service/source_tree.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buildtool/serve_api/serve_service/source_tree.hpp b/src/buildtool/serve_api/serve_service/source_tree.hpp index a1599508..0bdf48b8 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.hpp +++ b/src/buildtool/serve_api/serve_service/source_tree.hpp @@ -23,6 +23,7 @@ #include "gsl/gsl" #include "justbuild/just_serve/just_serve.grpc.pb.h" +#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" @@ -57,7 +58,7 @@ class SourceTreeService final CreateExecutionApi(std::nullopt)}; [[nodiscard]] static auto CreateExecutionApi( - std::optional<RemoteExecutionConfig::ServerAddress> const& address) + std::optional<ServerAddress> const& address) -> gsl::not_null<IExecutionApi::Ptr>; [[nodiscard]] static auto GetTreeFromCommit( |