Nightly Merge Wed 27 Nov 2024 13:10:05 GMT

oracle · Nov 27, 2024 · bec93e4 · bec93e4
2 parents 555ef3a + 22ca7c7
commit bec93e4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/development-build-desktop-application.yml b/.github/workflows/development-build-desktop-application.yml
@@ -108,7 +108,8 @@ jobs:
         if: matrix.os == 'windows-latest' && (failure() || success())
         run: |
           ls -R ./ocd/dist
-          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/make/squirrel.windows/x64/ocd-${{ env.OCD_VERSION }}*.exe --clobber
+          ls ./ocd/dist/make/squirrel.windows/x64
+          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/make/squirrel.windows/x64/ocd-${{ env.OCD_VERSION }}-Setup.exe --clobber
           # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/release/${{ env.OCD_VERSION }}/ocd-Windows-${{ env.OCD_VERSION }}*x64.exe --clobber
       - name: Upload Linux Artifact to Release
         if: matrix.os == 'ubuntu-latest' && (failure() || success())

diff --git a/ocd/package-lock.json b/ocd/package-lock.json
diff --git a/ocd/packages/desktop/package.json b/ocd/packages/desktop/package.json
@@ -47,6 +47,7 @@
     "@electron-forge/plugin-fuses": "^7.5.0",
     "@electron-forge/plugin-vite": "^7.5.0",
     "@electron/fuses": "^1.8.0",
+    "@types/electron-squirrel-startup": "^1.0.2",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "electron": ">=32.2.0",
@@ -64,7 +65,7 @@
     "@ocd/model": ">=0.2.5",
     "@ocd/query": ">=0.2.5",
     "@ocd/react": ">=0.2.5",
-    "oci-sdk": "^2.69.0",
-    "electron-squirrel-startup": "^1.0.1"
+    "electron-squirrel-startup": "^1.0.1",
+    "oci-sdk": "^2.69.0"
   }
 }
diff --git a/ocd/packages/desktop/src/main.ts b/ocd/packages/desktop/src/main.ts
@@ -4,6 +4,7 @@
 */
 
 import { app, dialog, BrowserWindow, ipcMain, screen, Menu, shell, MessageBoxOptions, MenuItemConstructorOptions } from 'electron'
+import Squirrel from 'electron-squirrel-startup'
 import path from 'path'
 import url from 'url'
 import fs from 'fs'
@@ -22,6 +23,7 @@ const isPreview = process.env.OCD_PREVIEW === 'true';
 const isMac = process.platform === 'darwin'
 
 // if (require('electron-squirrel-startup')) app.quit()
+if (Squirrel) app.quit()
 const ocdConfigDirectory = path.join(app.getPath('home'), '.ocd')
 const ocdConsoleConfigFilename = path.join(ocdConfigDirectory, 'console_config.json')
 const ocdCacheFilename = path.join(ocdConfigDirectory, 'cache.json')

diff --git a/ocd/packages/electron-desktop/package.json b/ocd/packages/electron-desktop/package.json
@@ -29,7 +29,7 @@
     "dev-build": "tsc && NODE_OPTIONS=--max-old-space-size=8192 vite build && electron-builder -c.electronVersion=32.2.0",
     "dev-tsc": "tsc",
     "dev-vite-build": "NODE_OPTIONS=--max-old-space-size=8192 vite build",
-    "build": "tsc && vite build && electron-builder -c.electronVersion=32.2.0",
+    "electron-builder-build": "tsc && vite build && electron-builder -c.electronVersion=32.2.0",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },