fix cargo pointing to ui client

Signed-off-by: Carlos Feria <[email protected]>
carlosthe19916 · Mar 2, 2025 · 7e98c07 · 7e98c07
1 parent 1fd5793
commit 7e98c07
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/ci-repo.yml b/.github/workflows/ci-repo.yml
@@ -17,6 +17,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: server/ui/package-lock.json
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies
       - name: Install clippy
@@ -30,6 +35,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: server/ui/package-lock.json
       - name: Install dependencies
         uses: ./.github/actions/install-dependencies
       - run: cargo test

diff --git a/server/ui/crate/build.rs b/server/ui/crate/build.rs
@@ -4,9 +4,9 @@ use std::{fs, io};
 
 use static_files::resource_dir;
 
-static UI_DIR: &str = "../";
-static UI_DIST_DIR: &str = "../dist";
-static STATIC_DIR: &str = "target/generated";
+static UI_DIR: &str = "../client";
+static UI_DIST_DIR: &str = "../client/dist";
+static STATIC_DIR: &str = "./target/generated";
 
 #[cfg(windows)]
 static NPM_CMD: &str = "npm.cmd";