fix desktop workflow

voxel51 · Aug 10, 2021 · 5894767 · 5894767
1 parent d9628b6
commit 5894767
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -73,7 +73,7 @@ jobs:
            -v ~/.cache/electron:/root/.cache/electron \
            -v ~/.cache/electron-builder:/root/.cache/electron-builder \
            electronuserland/builder:wine \
-           cd packages/desktop && yarn package-win --publish never
+           yarn workspace FiftyOne package-win --publish never
       - name: Set environment
         env:
           RELEASE_TAG: ${{ github.ref }}

diff --git a/app/packages/app/package.json b/app/packages/app/package.json
@@ -5,7 +5,8 @@
     "private": true,
     "scripts": {
         "dev": "vite",
-        "build": "tsc && vite build && yarn copy-to-python",
+        "build": "yarn build-bare && yarn copy-to-python",
+        "build-bare": "tsc && vite build",
         "copy-to-python": "rm -rf ../../../fiftyone/server/static && cp -r ./dist ../../../fiftyone/server/static",
         "copy-to-desktop": "rm -rf ../desktop/dist/ && cp -r ./dist ../desktop/dist",
         "start": "vite preview"

diff --git a/app/packages/desktop/package.json b/app/packages/desktop/package.json
@@ -9,7 +9,7 @@
   "prettier": "@fiftyone/prettier-config",
   "scripts": {
     "build-desktop": "yarn build-desktop-source && yarn pull-desktop-source && tsc -p tsconfig.json",
-    "build-desktop-source": "yarn workspace @fiftyone/app build",
+    "build-desktop-source": "yarn workspace @fiftyone/app build-bare",
     "pull-desktop-source": "yarn workspace @fiftyone/app copy-to-desktop",
     "start-desktop": "cross-env DEBUG_APP=true electron ./dist/main.js",
     "package-mac": "yarn build-desktop && electron-builder build --mac",