From 40f98ba62fe59ad42099441e32a0839655d2ff74 Mon Sep 17 00:00:00 2001 From: Andrey Gruzdev Date: Sat, 6 Apr 2024 19:54:00 +0200 Subject: [PATCH] implement cross-platform uid,gid support with platform-specific dependencies --- cargo-near/Cargo.toml | 4 +++- cargo-near/src/commands/build_command/mod.rs | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cargo-near/Cargo.toml b/cargo-near/Cargo.toml index 2ea11d3b..edb13f30 100644 --- a/cargo-near/Cargo.toml +++ b/cargo-near/Cargo.toml @@ -34,7 +34,6 @@ near-abi = { version = "0.4.0", features = ["__chunked-entries"] } libloading = "0.7.3" zstd = "0.11" atty = "0.2.14" -nix = { version = "0.28.0", features = ["user", "process"]} color-eyre = "0.6" inquire = "0.6" @@ -53,6 +52,9 @@ git2 = "0.14" cargo_toml = "0.19.1" reqwest = "0.11.24" +[target.'cfg(unix)'.dependencies] +nix = { version = "0.28.0", features = ["user", "process"] } + [features] default = ["ledger"] ledger = ["near-cli-rs/ledger"] diff --git a/cargo-near/src/commands/build_command/mod.rs b/cargo-near/src/commands/build_command/mod.rs index 6cf8422c..0f0a1869 100644 --- a/cargo-near/src/commands/build_command/mod.rs +++ b/cargo-near/src/commands/build_command/mod.rs @@ -1,6 +1,8 @@ -use std::process::Command; +use std::process::{Command, id}; use std::time::{SystemTime, UNIX_EPOCH}; -use nix::unistd::{getuid, getgid, getpid}; + +#[cfg(unix)] +use nix::unistd::{getuid, getgid}; use color_eyre::{ eyre::{ContextCompat, WrapErr}, @@ -105,11 +107,8 @@ pub fn docker_run(args: BuildCommand) -> color_eyre::eyre::Result color_eyre::eyre::Result