From 5894767f8bb43b493682156911d6e907388aec00 Mon Sep 17 00:00:00 2001 From: Benjamin Kane Date: Tue, 10 Aug 2021 08:26:21 -0600 Subject: [PATCH] fix desktop workflow --- .github/workflows/build-desktop.yml | 2 +- app/packages/app/package.json | 3 ++- app/packages/desktop/package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index fe956f90f6..262099c150 100644 --- 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 index 23036bcdc6..02ec56538a 100644 --- 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 index fa2769f7a0..5d8934b0fc 100644 --- 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",