Merge pull request #31 from fluentci-io/fix/flox-cache

fix nix cache issue in flox install
fluentci-io · Jul 9, 2024 · 1fb1e5e · 1fb1e5e
2 parents 356dcf8 + b12d621
commit 1fb1e5e
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -8,18 +8,18 @@ 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
 
 [dependencies]
 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
@@ -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
@@ -7,15 +7,15 @@ 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
 
 [dependencies]
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,17 +7,17 @@ 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
 
 [dependencies]
 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"]}