build: update

PiSugar · Dec 19, 2024 · 9e9de34 · 9e9de34
1 parent f0ef693
commit 9e9de34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
@@ -20,11 +20,11 @@ jobs:
       - name: NPM or Yarn install with caching
         uses: bahmutov/[email protected]
         with:
-          working-directory: electron
+          working-directory: pisugar-webui
 
       # Nodejs build web
       - run: npm run build:web
-        working-directory: electron
+        working-directory: pisugar-webui
 
       # Upload artifact
       - name: Upload artifacts

diff --git a/pisugar-server/Cargo.toml b/pisugar-server/Cargo.toml
@@ -79,20 +79,10 @@ assets = [
     "644",
   ],
   [
-    "../electron/dist/web/*",
+    "../pisugar-webui/dist/**/*",
     "usr/share/pisugar-server/web/",
     "644",
   ],
-  [
-    "../electron/dist/web/fonts/*",
-    "usr/share/pisugar-server/web/fonts",
-    "644",
-  ],
-  [
-    "../electron/dist/web/imgs/*",
-    "usr/share/pisugar-server/web/imgs",
-    "644",
-  ],
 ]
 conf-files = ["/etc/default/pisugar-server", "/etc/pisugar-server/config.json"]
 
@@ -110,4 +100,4 @@ pisugar-server = { path = "/usr/bin/pisugar-server" }
 "pisugar-server.default" = { path = "/etc/default/pisugar-server" }
 "config.json" = { path = "/etc/pisugar-server/config.json" }
 "_ws.json" = { path = "/usr/share/pisugar-server/web/_ws.json" }
-"../../electron/dist/web/" = { path = "/usr/share/pisugar-server/web" }
+"../../pisugar-webui/dist/" = { path = "/usr/share/pisugar-server/web" }