fix: merge dev

Sherlockouo · Dec 10, 2023 · c3a604a · c3a604a
2 parents d121a67 + cc7c65b
commit c3a604a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -99,6 +99,14 @@ jobs:
           name: R3PLAYX-mac-x64
           path: ./packages/desktop/release/*-x64.dmg
           if-no-files-found: ignore
+
+      - name: Upload mac latest yml
+        uses: actions/upload-artifact@v3
+        with:
+          name: latest-mac
+          path: ./packages/desktop/release/latest-mac.yml
+          if-no-files-found: ignore
+
 
       - name: Upload Artifact (macOS arm64)
         uses: actions/upload-artifact@v3
@@ -113,10 +121,24 @@ jobs:
           name: R3PLAYX-win
           path: ./packages/desktop/release/*x64-Setup.exe
           if-no-files-found: ignore
+
+      - name: Upload windows latest yml
+        uses: actions/upload-artifact@v3
+        with:
+          name: latest
+          path: ./packages/desktop/release/latest.yml
+          if-no-files-found: ignore
 
       - name: Upload Artifact (Linux)
         uses: actions/upload-artifact@v3
         with:
           name: R3PLAYX-linux
           path: ./packages/desktop/release/*.AppImage
           if-no-files-found: ignore
+
+      - name: Upload linux latest yml
+        uses: actions/upload-artifact@v3
+        with:
+          name: latest-linux
+          path: ./packages/desktop/release/latest-linux.yml
+          if-no-files-found: ignore
diff --git a/packages/desktop/main/index.ts b/packages/desktop/main/index.ts
@@ -4,9 +4,6 @@ import {
   app,
   BrowserWindow,
   BrowserWindowConstructorOptions,
-  dialog,
-  Menu,
-  MenuItem,
   shell,
 } from 'electron'
 import { release } from 'os'
@@ -17,7 +14,7 @@ import { createTray, YPMTray } from './tray'
 import { IpcChannels } from '@/shared/IpcChannels'
 import { createTaskbar, Thumbar } from './windowsTaskbar'
 import { createMenu } from './menu'
-import { appName, isDev, isLinux, isMac, isWindows } from './env'
+import { appName, isDev, isMac, isWindows } from './env'
 import store from './store'
 import initAppServer from './appServer/appServer'
 import { bindingKeyboardShortcuts } from './keyboardShortcuts'
@@ -79,7 +76,6 @@ class Main {
     const {
       default: installExtension,
       REACT_DEVELOPER_TOOLS,
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
     } = require('electron-devtools-installer')
     installExtension(REACT_DEVELOPER_TOOLS.id).catch((err: unknown) =>
       log.info('An error occurred: ', err)
@@ -93,9 +89,7 @@ class Main {
   }
 
   createTray() {
-    // if (isWindows || isLinux || isDev) {
     this.tray = createTray(this.win!)
-    // }
     if (isMac) {
       // create dock menu for macOS
       const createdDockMenu = createDockMenu(this.win!)