From 29710e2a95256edf2af032fd81b77ef4b13a60fd Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Tue, 10 Sep 2024 17:38:51 +0200 Subject: [PATCH 1/3] Update ya-utils-process depedency to version 0.3 --- Cargo.lock | 32 +++++++------------------------- Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 42154f28e..c9b3092b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3089,7 +3089,7 @@ dependencies = [ "ya-core-model", "ya-provider", "ya-utils-path", - "ya-utils-process 0.3.0", + "ya-utils-process", ] [[package]] @@ -8925,7 +8925,7 @@ dependencies = [ "tokio", "winapi 0.3.9", "ya-agreement-utils", - "ya-utils-process 0.3.0", + "ya-utils-process", ] [[package]] @@ -9066,7 +9066,7 @@ dependencies = [ "ya-utils-futures", "ya-utils-networking", "ya-utils-path", - "ya-utils-process 0.3.0", + "ya-utils-process", "yansi", ] @@ -9639,7 +9639,7 @@ dependencies = [ "ya-core-model", "ya-service-api", "ya-service-api-interfaces", - "ya-utils-process 0.3.0", + "ya-utils-process", ] [[package]] @@ -9714,7 +9714,7 @@ dependencies = [ "ya-utils-actix", "ya-utils-cli", "ya-utils-path", - "ya-utils-process 0.3.0", + "ya-utils-process", "yansi", ] @@ -10083,7 +10083,7 @@ dependencies = [ "tokio", "url", "ya-framework-macro", - "ya-utils-process 0.3.0", + "ya-utils-process", ] [[package]] @@ -10203,24 +10203,6 @@ dependencies = [ "log", ] -[[package]] -name = "ya-utils-process" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ae347dbc4362cc24241f96ddb7c4bc46fdc6f4772c2f92d12b40af359b81ef" -dependencies = [ - "actix", - "anyhow", - "derive_more", - "fs2", - "futures 0.3.30", - "futures-util", - "libc", - "nix 0.22.3", - "shared_child", - "tokio", -] - [[package]] name = "ya-utils-process" version = "0.3.0" @@ -10368,7 +10350,7 @@ dependencies = [ "ya-utils-futures", "ya-utils-networking", "ya-utils-path", - "ya-utils-process 0.2.0", + "ya-utils-process", "ya-version", "ya-vpn", ] diff --git a/Cargo.toml b/Cargo.toml index d54c4d295..b073b212a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,7 @@ ya-service-bus = { workspace = true } ya-sgx = "0.2" ya-utils-path = "0.1" ya-utils-futures.workspace = true -ya-utils-process = { version = "0.2", features = ["lock"] } +ya-utils-process = { version = "0.3", features = ["lock"] } ya-utils-networking = "0.2" ya-fd-metrics = { path = "utils/fd-metrics" } ya-version = "0.2" From ca8082417c353862a21beff5d3a6e08441ba1e20 Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Tue, 10 Sep 2024 18:20:48 +0200 Subject: [PATCH 2/3] Add handleapi feature --- utils/process/Cargo.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/process/Cargo.toml b/utils/process/Cargo.toml index 59ff3ade2..f8ee5e30c 100644 --- a/utils/process/Cargo.toml +++ b/utils/process/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" homepage = "https://github.com/golemfactory/yagna" repository = "https://github.com/golemfactory/yagna" license = "LGPL-3.0" -description="Yagna utils for asynchronous process handling" -keywords=["golem", "yagna", "process"] +description = "Yagna utils for asynchronous process handling" +keywords = ["golem", "yagna", "process"] [features] default = [] @@ -35,6 +35,7 @@ nix = "0.22" winapi = { version = "0.3", features = [ "jobapi2", "processthreadsapi", + "handleapi", ] } From b8c777efc770d637a8dc6ba21bb8e78e9b30b868 Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Wed, 11 Sep 2024 11:15:42 +0200 Subject: [PATCH 3/3] Meaningless change to trigger gh actions --- utils/process/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/process/Cargo.toml b/utils/process/Cargo.toml index f8ee5e30c..00420799d 100644 --- a/utils/process/Cargo.toml +++ b/utils/process/Cargo.toml @@ -38,6 +38,5 @@ winapi = { version = "0.3", features = [ "handleapi", ] } - [target.'cfg(target_os = "macos")'.dependencies] libproc = { version = "0.7" }