summaryrefslogtreecommitdiff
path: root/src/other_tools/just_mr/setup.cpp
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2023-11-02 11:35:51 +0100
committerAlberto Sartori <alberto.sartori@huawei.com>2023-11-15 20:19:18 +0100
commit40ed3ee050e0fc3d0f41fc46f7360d28b9a1f7cc (patch)
treee1096799ec23b3ae5009cbbead98ee5db559e54a /src/other_tools/just_mr/setup.cpp
parente2e0e3b4e92885dd74127aacaabb0c5f3ba86ce7 (diff)
downloadjustbuild-40ed3ee050e0fc3d0f41fc46f7360d28b9a1f7cc.tar.gz
just-mr: Update to using the static methods of ServeApi
Diffstat (limited to 'src/other_tools/just_mr/setup.cpp')
-rw-r--r--src/other_tools/just_mr/setup.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/other_tools/just_mr/setup.cpp b/src/other_tools/just_mr/setup.cpp
index 5aab7095..b71ae3bb 100644
--- a/src/other_tools/just_mr/setup.cpp
+++ b/src/other_tools/just_mr/setup.cpp
@@ -90,13 +90,13 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
}
// setup the APIs for archive fetches
- auto remote_api = JustMR::Utils::SetupRemoteApi(
+ auto remote_api = JustMR::Utils::GetRemoteApi(
common_args.remote_execution_address, auth_args);
IExecutionApi::Ptr local_api{remote_api ? std::make_unique<LocalApi>()
: nullptr};
- // setup the API for serving trees of Gti repos or archives
- auto serve_api = JustMR::Utils::SetupServeApi(
+ // setup the API for serving trees of Git repos or archives
+ auto serve_api_exists = JustMR::Utils::SetupServeApi(
common_args.remote_serve_address, auth_args);
// setup the required async maps
@@ -123,7 +123,7 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
common_args.alternative_mirrors,
common_args.git_path->string(),
*common_args.local_launcher,
- serve_api ? &(*serve_api) : nullptr,
+ serve_api_exists,
local_api ? &(*local_api) : nullptr,
remote_api ? &(*remote_api) : nullptr,
common_args.fetch_absent,
@@ -136,7 +136,7 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
common_args.ca_info,
&resolve_symlinks_map,
&critical_git_op_map,
- serve_api ? &(*serve_api) : nullptr,
+ serve_api_exists,
local_api ? &(*local_api) : nullptr,
remote_api ? &(*remote_api) : nullptr,
common_args.fetch_absent,