From 17a0e8606ee4ad26812790e11e270fd672b8c236 Mon Sep 17 00:00:00 2001
From: chmanie <code@chmanie.com>
Date: Mon, 12 Jun 2023 16:05:22 +0200
Subject: [PATCH] Try to add release files

---
 .gitea/workflows/release.yml                              | 7 +++++--
 Cross.toml                                                | 4 ++--
 ...gnu-Dockerfile => aarch64-unknown-linux-gnu-Dockerfile | 0
 ...Dockerfile => armv7-unknown-linux-gnueabihf-Dockerfile | 0
 cbd-tui/src/main.rs                                       | 8 +++++---
 crabidy-server/Cargo.toml                                 | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)
 rename crabidy-server/aarch64-unknown-linux-gnu-Dockerfile => aarch64-unknown-linux-gnu-Dockerfile (100%)
 rename crabidy-server/armv7-unknown-linux-gnueabihf-Dockerfile => armv7-unknown-linux-gnueabihf-Dockerfile (100%)

diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index a2b747d..7c09c6e 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -2,7 +2,8 @@ name: CI release
 run-name: CI release
 on:
   push:
-    tags: '*'
+    tags:
+      - '*'
 
 jobs:
   release:
@@ -16,11 +17,13 @@ jobs:
       - uses: actions/checkout@v3
       - run: cargo fmt --check
       - uses: https://github.com/Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.target }}
       - name: cross compile for ${{ matrix.target }}
         run: cross build --target ${{ matrix.target }} --release
       - uses: actions/release-action@main
         with:
           files: |-
-            target/${{ matrix.target }}/release/crabidy-server
+            target/${{ matrix.target }}/release/cbd-tui
           api_key: '${{secrets.RELEASE_TOKEN}}'
           pre_release: true
diff --git a/Cross.toml b/Cross.toml
index 6186207..17444d8 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,8 +1,8 @@
 [target.armv7-unknown-linux-gnueabihf]
 xargo = false
-dockerfile = "./crabidy-server/armv7-unknown-linux-gnueabihf-Dockerfile"
+dockerfile = "./armv7-unknown-linux-gnueabihf-Dockerfile"
 
 [target.aarch64-unknown-linux-gnu]
 xargo = false
-dockerfile = "./crabidy-server/aarch64-unknown-linux-gnu-Dockerfile"
+dockerfile = "./aarch64-unknown-linux-gnu-Dockerfile"
 
diff --git a/crabidy-server/aarch64-unknown-linux-gnu-Dockerfile b/aarch64-unknown-linux-gnu-Dockerfile
similarity index 100%
rename from crabidy-server/aarch64-unknown-linux-gnu-Dockerfile
rename to aarch64-unknown-linux-gnu-Dockerfile
diff --git a/crabidy-server/armv7-unknown-linux-gnueabihf-Dockerfile b/armv7-unknown-linux-gnueabihf-Dockerfile
similarity index 100%
rename from crabidy-server/armv7-unknown-linux-gnueabihf-Dockerfile
rename to armv7-unknown-linux-gnueabihf-Dockerfile
diff --git a/cbd-tui/src/main.rs b/cbd-tui/src/main.rs
index f58745f..f1aada0 100644
--- a/cbd-tui/src/main.rs
+++ b/cbd-tui/src/main.rs
@@ -43,7 +43,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     tokio::task::spawn_blocking(|| {
         run_ui(ui_tx, ui_rx);
     })
-    .await;
+    .await?;
 
     Ok(())
 }
@@ -55,14 +55,16 @@ async fn orchestrate<'a>(
     let mut rpc_client = rpc::RpcClient::connect(&config.server.address).await?;
 
     if let Some(root_node) = rpc_client.get_library_node("node:/").await? {
-        tx.send(MessageToUi::ReplaceLibraryNode(root_node.clone()));
+        tx.send(MessageToUi::ReplaceLibraryNode(root_node.clone()))?;
     }
 
     let init_data = rpc_client.init().await?;
     tx.send_async(MessageToUi::Init(init_data)).await?;
 
     loop {
-        poll(&mut rpc_client, &rx, &tx).await.ok();
+        if let Err(er) = poll(&mut rpc_client, &rx, &tx).await {
+            println!("ERROR");
+        }
     }
 }
 
diff --git a/crabidy-server/Cargo.toml b/crabidy-server/Cargo.toml
index 94827b0..111c1fc 100644
--- a/crabidy-server/Cargo.toml
+++ b/crabidy-server/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [[bin]]
-name = "crabidy_server"
+name = "crabidy-server"
 path = "src/main.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html