diff --git a/Cargo.lock b/Cargo.lock index ea8733f..734acfe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2093,7 +2093,7 @@ dependencies = [ [[package]] name = "fluentci-common" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "dirs 5.0.1", @@ -2108,7 +2108,7 @@ dependencies = [ [[package]] name = "fluentci-core" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "chrono", @@ -2133,7 +2133,7 @@ dependencies = [ [[package]] name = "fluentci-engine" -version = "0.4.4" +version = "0.4.5" dependencies = [ "anyhow", "clap", @@ -2151,7 +2151,7 @@ dependencies = [ [[package]] name = "fluentci-ext" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "async-trait", @@ -2174,7 +2174,7 @@ dependencies = [ [[package]] name = "fluentci-graphql" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "async-graphql", @@ -2248,7 +2248,7 @@ dependencies = [ [[package]] name = "fluentci-server" -version = "0.3.2" +version = "0.3.3" dependencies = [ "actix-cors", "actix-web", @@ -2265,7 +2265,7 @@ dependencies = [ [[package]] name = "fluentci-shared" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anyhow", "extism", diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 6c63977..88f873b 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -8,7 +8,7 @@ license = "MPL-2.0" name = "fluentci-engine" readme = "../../README.md" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.4.4" +version = "0.4.5" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,10 +16,10 @@ version = "0.4.4" anyhow = "1.0.81" clap = "3.2.20" extism = "1.2.0" -fluentci-core = {path = "../core", version = "0.3.2"} -fluentci-ext = {path = "../ext", version = "0.2.2"} -fluentci-server = {path = "../server", version = "0.3.2"} -fluentci-shared = {path = "../shared", version = "0.2.2"} +fluentci-core = {path = "../core", version = "0.3.3"} +fluentci-ext = {path = "../ext", version = "0.2.3"} +fluentci-server = {path = "../server", version = "0.3.3"} +fluentci-shared = {path = "../shared", version = "0.2.3"} get-port = "4.0.0" md5 = "0.7.0" regex = "1.10.3" diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index f49f09d..fdee38f 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -7,15 +7,15 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"] license = "MPL-2.0" name = "fluentci-common" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.2.2" +version = "0.2.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] anyhow = "1.0.81" dirs = "5.0.1" -fluentci-core = {path = "../core", version = "0.3.2"} -fluentci-ext = {path = "../ext", version = "0.2.2"} +fluentci-core = {path = "../core", version = "0.3.3"} +fluentci-ext = {path = "../ext", version = "0.2.3"} fluentci-secrets = {path = "../secrets", version = "0.1.0"} fluentci-types = {path = "../types", version = "0.1.7"} regex = "1.10.4" diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 193ef76..6624135 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"] license = "MPL-2.0" name = "fluentci-core" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.3.2" +version = "0.3.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -15,7 +15,7 @@ version = "0.3.2" anyhow = "1.0.81" chrono = "0.4.35" dirs = "5.0.1" -fluentci-ext = {path = "../ext", version = "0.2.2"} +fluentci-ext = {path = "../ext", version = "0.2.3"} fluentci-logging = {path = "../logging", version = "0.1.0"} fluentci-secrets = {path = "../secrets", version = "0.1.0"} fluentci-types = {path = "../types", version = "0.1.7"} diff --git a/crates/ext/Cargo.toml b/crates/ext/Cargo.toml index a8e692e..a210e7b 100644 --- a/crates/ext/Cargo.toml +++ b/crates/ext/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"] license = "MPL-2.0" name = "fluentci-ext" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.2.2" +version = "0.2.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/ext/src/flox.rs b/crates/ext/src/flox.rs index 730d3f0..82fbc91 100644 --- a/crates/ext/src/flox.rs +++ b/crates/ext/src/flox.rs @@ -1,4 +1,5 @@ use std::{ + env::consts::OS, process::{Command, ExitStatus, Stdio}, sync::mpsc::Sender, }; @@ -80,14 +81,18 @@ impl Extension for Flox { .spawn()? .wait()?; + let sudo = if OS == "macos" { "sudo" } else { "" }; + Command::new("sh") .arg("-c") - .arg( - "nix profile install --impure \ + .arg(&format!( + "{} nix profile install --impure \ --experimental-features 'nix-command flakes' \ --accept-flake-config \ github:flox/flox", - ) + sudo + )) + .stdin(Stdio::inherit()) .stdout(Stdio::inherit()) .stderr(Stdio::inherit()) .spawn()? diff --git a/crates/graphql/Cargo.toml b/crates/graphql/Cargo.toml index 6170dd0..9c4aa91 100644 --- a/crates/graphql/Cargo.toml +++ b/crates/graphql/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"] license = "MPL-2.0" name = "fluentci-graphql" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.3.2" +version = "0.3.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,9 +16,9 @@ anyhow = "1.0.80" async-graphql = "7.0.2" async-graphql-actix-web = "7.0.2" dirs = "5.0.1" -fluentci-common = {path = "../common", version = "0.2.2"} -fluentci-core = {path = "../core", version = "0.3.2"} -fluentci-ext = {path = "../ext", version = "0.2.2"} +fluentci-common = {path = "../common", version = "0.2.3"} +fluentci-core = {path = "../core", version = "0.3.3"} +fluentci-ext = {path = "../ext", version = "0.2.3"} fluentci-secrets = {path = "../secrets", version = "0.1.0"} fluentci-types = {path = "../types", version = "0.1.7"} regex = "1.10.3" diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml index fb0dbce..d076bbf 100644 --- a/crates/server/Cargo.toml +++ b/crates/server/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"] license = "MPL-2.0" name = "fluentci-server" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.3.2" +version = "0.3.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,9 +17,9 @@ actix-web = "4.5.1" anyhow = "1.0.81" async-graphql = "7.0.2" async-graphql-actix-web = "7.0.2" -fluentci-core = {path = "../core", version = "0.3.2"} -fluentci-ext = {path = "../ext", version = "0.2.2"} -fluentci-graphql = {path = "../graphql", version = "0.3.1"} +fluentci-core = {path = "../core", version = "0.3.3"} +fluentci-ext = {path = "../ext", version = "0.2.3"} +fluentci-graphql = {path = "../graphql", version = "0.3.3"} mime_guess = "2.0.4" owo-colors = "4.0.0" tokio = "1.36.0" diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml index e5a5178..759ad7b 100644 --- a/crates/shared/Cargo.toml +++ b/crates/shared/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"] license = "MPL-2.0" name = "fluentci-shared" repository = "https://github.com/fluentci-io/fluentci-engine" -version = "0.2.2" +version = "0.2.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -15,9 +15,9 @@ version = "0.2.2" anyhow = "1.0.82" extism = "1.2.0" extism-pdk = "1.1.0" -fluentci-common = {path = "../common", version = "0.2.2"} -fluentci-core = {path = "../core", version = "0.3.2"} -fluentci-ext = {path = "../ext", version = "0.2.2"} +fluentci-common = {path = "../common", version = "0.2.3"} +fluentci-core = {path = "../core", version = "0.3.3"} +fluentci-ext = {path = "../ext", version = "0.2.3"} fluentci-secrets = {path = "../secrets", version = "0.1.0"} fluentci-types = {path = "../types", version = "0.1.7"} serde = {version = "1.0.197", features = ["serde_derive", "derive"]}