- Improve Github actions

- Upgrade dependencies
raindropio · Feb 25, 2021 · f911c0a · f911c0a
1 parent a48d3a5
commit f911c0a
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 147 deletions.
diff --git a/.github/workflows/macos-arm.yml → .github/workflows/darwin.yml b/.github/workflows/macos-arm.yml → .github/workflows/darwin.yml
@@ -27,9 +27,9 @@ jobs:
     - name: install dependencies
       run: yarn
 
-    - name: build arm64
+    - name: build all architectures
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         APPLE_ID: ${{ secrets.APPLE_ID }}
         APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-      run: DEBUG=electron-packager yarn electron-forge publish --platform=darwin --arch=arm64
+      run: DEBUG=electron-packager yarn electron-forge publish --arch=all
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
diff --git a/.github/workflows/windows.yml → .github/workflows/win32.yml b/.github/workflows/windows.yml → .github/workflows/win32.yml
diff --git a/forge.config.js b/forge.config.js
@@ -1,7 +1,6 @@
 const path = require('path')
 const util = require('util')
 const exec = util.promisify(require('child_process').exec)
-const argv = require('minimist')(process.argv.slice(2))
 
 module.exports = {
     hooks: {
@@ -60,8 +59,8 @@ module.exports = {
         },
         {
             name: '@electron-forge/maker-dmg',
-            config: {
-                name:       'Raindrop'+((argv.arch=='x64' || !argv.arch) ? '' : `-${argv.arch}`),
+            config: arch=>({
+                name:       `Raindrop-${arch}`,
                 background: './build/mac/dmg@2x.png',
                 format:     'ULFO',
                 icon:       './build/icon.icns',
@@ -74,7 +73,7 @@ module.exports = {
                 additionalDMGOptions: {
                     window: {size: {width: 780, height: 435}}
                 },
-            }
+            })
         },
         {
             name: '@electron-forge/maker-squirrel',

diff --git a/package.json b/package.json
@@ -25,13 +25,12 @@
 	},
 	"dependencies": {
 		"@sentry/electron": "^2.0.1",
-		"electron-context-menu": "2.4.x",
+		"electron-context-menu": "2.5.x",
 		"electron-is-dev": "1.x",
 		"electron-squirrel-startup": "1.x",
 		"electron-util": "^0.14.2",
 		"electron-window-state": "5.x",
 		"lodash": "^4.17.20",
-		"minimist": "^1.2.5",
 		"update-electron-app": "2.0.x"
 	},
 	"devDependencies": {
@@ -40,7 +39,7 @@
 		"@electron-forge/maker-squirrel": "6.0.0-beta.54",
 		"@electron-forge/maker-zip": "6.0.0-beta.54",
 		"@electron-forge/publisher-github": "6.0.0-beta.54",
-		"electron": "11.2.x",
+		"electron": "11.3.x",
 		"shx": "^0.3.2"
 	}
 }
diff --git a/src/menu.js b/src/menu.js
@@ -1,4 +1,4 @@
-const { app, dialog, shell, autoUpdater, Menu } = require('electron')
+const { dialog, shell, autoUpdater, Menu } = require('electron')
 
 var state = {
     update: '',
@@ -32,7 +32,27 @@ function render() {
                 role: 'editMenu'
             },
             {
-                role: 'viewMenu'
+                label: 'View',
+                submenu: [
+                    { role: 'reload' },
+                    { role: 'forceReload' },
+                    { role: 'toggleDevTools' },
+                    { type: 'separator' },
+                    { role: 'resetZoom' },
+                    { role: 'zoomIn' },
+                    //fix on macos
+                    { 
+                        role: 'zoomin', 
+                        accelerator: 'CommandOrControl+=',
+                        visible: false,
+                        enabled: true,
+                    },
+                    { role: 'zoomOut' },
+                    ...(process.platform=='darwin' ? [
+                        { type: 'separator' },
+                        { role: 'togglefullscreen' }
+                    ] : [])
+                ]
             },
             {
                 label: 'History',