Skip to content

Commit

Permalink
ci: Fix pipelines (#581)
Browse files Browse the repository at this point in the history
  • Loading branch information
ngruelaneo authored Jan 7, 2025
2 parents 7edd98e + d42792e commit f589859
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 20 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4
with:
dotnet-version: 6.x
dotnet-version: |
6.x
8.x
- name: Install ReSharper
run: |
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ jobs:
lang: Rust
plateform:
os: windows-2019
# FIXME: Rust should be working on Windows,
# but we most likely encounter a port exhaustion issue
- language:
lang: Rust
plateform:
os: windows-latest
- language:
lang: C#
dotnet: ''
Expand Down Expand Up @@ -129,9 +135,10 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4
if: ${{ matrix.language.dotnet }} != ""
with:
dotnet-version: ${{ matrix.language.dotnet }}
dotnet-version: |
6.x
8.x
- name: Print language
run: |
Expand Down
20 changes: 10 additions & 10 deletions packages/cpp/ArmoniK.Api.Client/header/submitter/SubmitterClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ class [[deprecated("Use the Session, Task and Result clients instead")]] Submitt
* @param chunk_max_size The maximum chunk size.
* @return A future large task request object.
*/
static std::future<std::vector<armonik::api::grpc::v1::submitter::CreateLargeTaskRequest>> task_chunk_stream(
const armonik::api::grpc::v1::TaskRequest &task_request, bool is_last, size_t chunk_max_size);
static std::future<std::vector<armonik::api::grpc::v1::submitter::CreateLargeTaskRequest>>
task_chunk_stream(const armonik::api::grpc::v1::TaskRequest &task_request, bool is_last, size_t chunk_max_size);

/**
* @brief Creates tasks asynchronously with the specified options and requests.
Expand All @@ -78,9 +78,9 @@ class [[deprecated("Use the Session, Task and Result clients instead")]] Submitt
* @param task_requests The vector of task requests.
* @return A future create task reply object.
*/
std::future<armonik::api::grpc::v1::submitter::CreateTaskReply> create_tasks_async(
std::string session_id, armonik::api::grpc::v1::TaskOptions task_options,
const std::vector<armonik::api::grpc::v1::TaskRequest> &task_requests);
std::future<armonik::api::grpc::v1::submitter::CreateTaskReply>
create_tasks_async(std::string session_id, armonik::api::grpc::v1::TaskOptions task_options,
const std::vector<armonik::api::grpc::v1::TaskRequest> &task_requests);

/**
* @brief Submits tasks with dependencies to the session context.
Expand All @@ -90,9 +90,9 @@ class [[deprecated("Use the Session, Task and Result clients instead")]] Submitt
* @param max_retries The maximum number of retries for submitting tasks.
* @return A vector of submitted task IDs.
*/
std::pair<std::vector<std::string>, std::vector<std::string>> submit_tasks_with_dependencies(
std::string session_id, armonik::api::grpc::v1::TaskOptions task_options,
const std::vector<payload_data> &payloads_with_dependencies, int max_retries);
std::pair<std::vector<std::string>, std::vector<std::string>>
submit_tasks_with_dependencies(std::string session_id, armonik::api::grpc::v1::TaskOptions task_options,
const std::vector<payload_data> &payloads_with_dependencies, int max_retries);

/**
* @brief Get result without streaming.
Expand All @@ -101,8 +101,8 @@ class [[deprecated("Use the Session, Task and Result clients instead")]] Submitt
*/
std::future<std::string> get_result_async(const armonik::api::grpc::v1::ResultRequest &result_request);

std::map<std::string, armonik::api::grpc::v1::result_status::ResultStatus> get_result_status(
const std::string &session_id, const std::vector<std::string> &result_ids);
std::map<std::string, armonik::api::grpc::v1::result_status::ResultStatus>
get_result_status(const std::string &session_id, const std::vector<std::string> &result_ids);
};

} // namespace client
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,10 @@ armonik::api::common::utils::getServiceConfigJson(const armonik::api::common::op
if (!status.ok()) {
throw std::invalid_argument("Timeout is invalid" + status.ToString());
}
ss << R"({ "methodConfig": [{ "name": [{}], )"
<< R"("timeout" : )" << timeout << ',' << R"("retryPolicy" : {)"
ss << R"({ "methodConfig": [{ "name": [{}], )" << R"("timeout" : )" << timeout << ',' << R"("retryPolicy" : {)"
<< R"("backoffMultiplier": )" << config.getBackoffMultiplier() << ',' << R"("initialBackoff":)" << initialBackoff
<< ","
<< R"("maxBackoff":)" << maxBackoff << ","
<< R"("maxAttempts":)" << config.getMaxAttempts() << ','
<< R"("retryableStatusCodes": [ "UNAVAILABLE", "ABORTED", "UNKNOWN" ])"
<< "}}]}";
<< "," << R"("maxBackoff":)" << maxBackoff << "," << R"("maxAttempts":)" << config.getMaxAttempts() << ','
<< R"("retryableStatusCodes": [ "UNAVAILABLE", "ABORTED", "UNKNOWN" ])" << "}}]}";
return ss.str();
}

Expand Down

0 comments on commit f589859

Please sign in to comment.