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/graph_traverser/graph_traverser.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/graph_traverser/graph_traverser.hpp')
| -rw-r--r-- | src/buildtool/graph_traverser/graph_traverser.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buildtool/graph_traverser/graph_traverser.hpp b/src/buildtool/graph_traverser/graph_traverser.hpp index 9f99e6f2..8567395e 100644 --- a/src/buildtool/graph_traverser/graph_traverser.hpp +++ b/src/buildtool/graph_traverser/graph_traverser.hpp @@ -30,6 +30,7 @@ #include "fmt/core.h" #include "gsl/gsl" #include "src/buildtool/common/cli.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/common/tree.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" @@ -270,7 +271,7 @@ class GraphTraverser { } [[nodiscard]] static auto CreateExecutionApi( - std::optional<RemoteExecutionConfig::ServerAddress> const& address) + std::optional<ServerAddress> const& address) -> gsl::not_null<IExecutionApi::Ptr> { if (address) { ExecutionConfiguration config; |