Merge pull request #225 from ikatson/desktop-same-workspace

Desktop same workspace

.github/workflows/release-osx.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           generate_release_notes: true
           files: |
-            desktop/src-tauri/target/universal-apple-darwin/release/bundle/dmg/rqbit-desktop_*_universal.dmg
+            target/universal-apple-darwin/release/bundle/dmg/rqbit-desktop_*_universal.dmg
 
       - name: Make a directory for output artifacts
         run: mkdir -p target/artifacts

.github/workflows/release-windows.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           generate_release_notes: true
           files: |
-            desktop/src-tauri/target/release/bundle/msi/rqbit-desktop_*_x64_en-US.msi
+            target/release/bundle/msi/rqbit-desktop_*_x64_en-US.msi
 
       - name: Build release
         run: cargo build --profile release-github

.github/workflows/test.yml

@@ -27,18 +27,6 @@ jobs:
       - run: rustup override set ${{ matrix.rust_version }}
       - name: cargo check
         run: cargo check
-  check-desktop:
-    runs-on: windows-latest
-    steps:
-      - name: rustup toolchain install 1.75
-        run: |
-          rustup toolchain install 1.75
-      - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup override set 1.75
-      - name: cargo check desktop
-        working-directory: desktop/src-tauri
-        run: cargo check
   test:
     strategy:
       matrix:
@@ -48,5 +36,11 @@ jobs:
       - uses: actions/checkout@v4
       - run: rustup toolchain install stable --profile minimal
       - uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: v1
+      - name: Run tests (whole workspace, including desktop)
+        if: ${{ matrix.os != 'ubuntu-latest' }}
+        run: cargo test --workspace
       - name: Run tests
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         run: cargo test

.taurignore

@@ -0,0 +1 @@
+crates/librqbit/webui/

Cargo.toml

@@ -1,8 +1,8 @@
 [workspace]
 resolver = "2"
 members = [
-    "crates/librqbit",
     "crates/rqbit",
+    "crates/librqbit",
     "crates/buffers",
     "crates/clone_to_owned",
     "crates/bencode",
@@ -11,11 +11,26 @@ members = [
     "crates/peer_binary_protocol",
     "crates/dht",
     "crates/upnp",
-    "crates/tracker_comms", "crates/upnp-serve",
+    "crates/tracker_comms",
+    "crates/upnp-serve",
+    "desktop/src-tauri",
 ]
 
-[profile.dev]
-panic = "abort"
+# Everything except desktop
+default-members = [
+    "crates/rqbit",
+    "crates/librqbit",
+    "crates/buffers",
+    "crates/clone_to_owned",
+    "crates/bencode",
+    "crates/sha1w",
+    "crates/librqbit_core",
+    "crates/peer_binary_protocol",
+    "crates/dht",
+    "crates/upnp",
+    "crates/tracker_comms",
+    "crates/upnp-serve",
+]
 
 [profile.release]
 panic = "abort"

desktop/src-tauri/Cargo.toml

@@ -37,5 +37,3 @@ gethostname = "0.5.0"
 # this feature is used for production builds or when `devPath` points to the filesystem
 # DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
-
-[workspace]