From 724691bfc2924cfa95230a26110705a1784ff0ae Mon Sep 17 00:00:00 2001
From: Igor Katson <igor.katson@gmail.com>
Date: Sat, 2 Dec 2023 22:56:01 +0000
Subject: [PATCH] Developing release scripts for windows Tauri

---
 .github/workflows/release.yml     | 36 +++++++++++++++++++++++++++++++
 desktop/package.json              |  4 ++--
 desktop/src-tauri/Cargo.lock      | 10 ++++-----
 desktop/src-tauri/Cargo.toml      |  2 +-
 desktop/src-tauri/tauri.conf.json |  4 ++--
 5 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 328142f..d671e28 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,6 +13,22 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
+    - name: install Tauri
+      run:
+        cargo install tauri-cli --profile dev
+    - name: npm install (desktop)
+      working-directory: desktop
+      run:
+        npm install
+    - name: npm install (librqbit/webui)
+      working-directory: crates/librqbit/webui
+      run:
+        npm install
+    - name: cargo tauri build
+      working-directory: desktop
+      run:
+        cargo tauri build --ci
+
     - name: Build release
       run:
         cargo build --profile release-github
@@ -21,6 +37,8 @@ jobs:
         body: This release and its artifacts were built with a GitHub action
         files: |
           target/release-github/rqbit.exe
+          desktop/src-tauri/target/release/bundle/msi/rqbit-desktop_1.0.0_x64_en-US.msi
+          desktop/src-tauri/target/release/bundle/nsis/rqbit-desktop_1.0.0_x64-setup.exe
 
   cross-compile-on-macos:
     runs-on: macos-11
@@ -31,6 +49,23 @@ jobs:
         brew tap messense/macos-cross-toolchains &&
         brew install x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu arm-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf
 
+    - name: install Tauri
+      run:
+        cargo install tauri-cli --profile dev
+    - name: npm install (desktop)
+      working-directory: desktop
+      run:
+        npm install
+    - name: npm install (librqbit/webui)
+      working-directory: crates/librqbit/webui
+      run:
+        npm install
+    - name: cargo tauri build
+      working-directory: desktop
+      run:
+        rustup target add aarch64-apple-darwin &&
+        cargo tauri build --target universal-apple-darwin --ci
+
     - name: Make a directory for output artifacts
       run:
         mkdir -p target/artifacts
@@ -75,4 +110,5 @@ jobs:
           target/artifacts/rqbit-linux-static-aarch64
           target/artifacts/rqbit-linux-static-armv6
           target/artifacts/rqbit-linux-static-armv7
+          desktop/src-tauri/target/universal-apple-darwin/release/bundle/dmg/rqbit-desktop_1.0.0_universal.dmg
 
diff --git a/desktop/package.json b/desktop/package.json
index c824d6a..0940fb1 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "rqbit",
   "private": true,
-  "version": "0.0.0",
+  "version": "4.0.0-beta.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -23,4 +23,4 @@
     "typescript": "^5.0.2",
     "vite": "^4.4.4"
   }
-}
+}
\ No newline at end of file
diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock
index 607e557..7de6886 100644
--- a/desktop/src-tauri/Cargo.lock
+++ b/desktop/src-tauri/Cargo.lock
@@ -1856,7 +1856,7 @@ dependencies = [
 
 [[package]]
 name = "librqbit"
-version = "4.0.0-beta.2"
+version = "4.0.0-beta.3"
 dependencies = [
  "anyhow",
  "axum",
@@ -1920,7 +1920,7 @@ version = "2.2.1"
 
 [[package]]
 name = "librqbit-core"
-version = "3.1.0"
+version = "3.2.0"
 dependencies = [
  "anyhow",
  "directories",
@@ -1939,7 +1939,7 @@ dependencies = [
 
 [[package]]
 name = "librqbit-dht"
-version = "4.0.0-beta.2"
+version = "4.0.0-beta.3"
 dependencies = [
  "anyhow",
  "backoff",
@@ -1963,7 +1963,7 @@ dependencies = [
 
 [[package]]
 name = "librqbit-peer-protocol"
-version = "3.1.0"
+version = "3.2.0"
 dependencies = [
  "anyhow",
  "bincode",
@@ -2967,7 +2967,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "rqbit"
+name = "rqbit-desktop"
 version = "0.0.0"
 dependencies = [
  "anyhow",
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
index 68775d4..1ba2094 100644
--- a/desktop/src-tauri/Cargo.toml
+++ b/desktop/src-tauri/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rqbit"
+name = "rqbit-desktop"
 version = "0.0.0"
 description = "A Tauri App"
 authors = ["you"]
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index 5ee7b1b..b10d091 100644
--- a/desktop/src-tauri/tauri.conf.json
+++ b/desktop/src-tauri/tauri.conf.json
@@ -6,8 +6,8 @@
     "distDir": "../dist"
   },
   "package": {
-    "productName": "rqbit",
-    "version": "4.0.0-beta.3"
+    "productName": "rqbit-desktop",
+    "version": "1.0.0"
   },
   "tauri": {
     "allowlist": {