From 9ef2ffa9acdc19453c81696aa2ed4da7cb84078c Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Thu, 21 Sep 2023 18:19:58 +0200 Subject: 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. --- src/buildtool/serve_api/serve_service/source_tree.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/buildtool/serve_api/serve_service/source_tree.hpp') 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 const& address) + std::optional const& address) -> gsl::not_null; [[nodiscard]] static auto GetTreeFromCommit( -- cgit v1.2.3