Merge remote-tracking branch 'origin/main' into feat/build_aarch64

edgenai · Feb 5, 2024 · a161b46 · a161b46
2 parents e4eef1e + 68470e6
commit a161b46
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,6 +70,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          RUSTFLAGS: "--cfg tokio_unstable"
         with:
           tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
           releaseName: "v__VERSION__"

diff --git a/crates/edgen_server/src/lib.rs b/crates/edgen_server/src/lib.rs
@@ -155,11 +155,7 @@ fn serve(args: &cli::Serve) -> EdgenResult {
 
 #[tokio::main]
 async fn start_server(args: &cli::Serve) -> EdgenResult {
-    // The console is disabled in release builds, so there is no need to initialise this
-    #[cfg(debug_assertions)]
-    {
-        console_subscriber::init();
-    }
+    console_subscriber::init();
 
     SETTINGS
         .write()

diff --git a/edgen/src-tauri/Cargo.toml b/edgen/src-tauri/Cargo.toml
@@ -20,11 +20,12 @@ serde_json = "1.0"
 tokio = { workspace = true, features = ["full", "tracing"] }
 tracing = { workspace = true }
 opener = "0.6.1"
-edgen_server = { path = "../../crates/edgen_server"}
-edgen_core   = { path = "../../crates/edgen_core"}
+edgen_server = { path = "../../crates/edgen_server" }
+edgen_core = { path = "../../crates/edgen_core" }
 
 [features]
 no_gui = []
 # this feature is used for production builds or when `devPath` points to the filesystem
 # DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
+enable-windows-terminal = []
diff --git a/edgen/src-tauri/src/main.rs b/edgen/src-tauri/src/main.rs
@@ -10,8 +10,10 @@
  * limitations under the License.
  */
 
-// Tauri - prevents additional console window on Windows in release, DO NOT REMOVE!!
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+#![cfg_attr(
+    not(feature = "enable-windows-terminal"),
+    windows_subsystem = "windows"
+)]
 
 #[cfg(not(feature = "no_gui"))]
 mod gui;