Add manual trigger to desktop app build (#1356)

* Set desktop app build on workflow_dispatch

* Update workflow_dispatch

* Add yarn cache to build desktop app

Upgrade electron to latest compatible version

Co-authored-by: Mikhail Mikheev <mmvsha73@gmail.com>

.github/workflows/release.yml

@@ -1,10 +1,8 @@
 name: Build/Release Desktop app
 
 # this will help you specify where to run
-on:
-  push:
-    branches:
-      - master
+on: 
+  workflow_dispatch
 
 env:
   REACT_APP_BLOCKNATIVE_KEY: ${{ secrets.REACT_APP_BLOCKNATIVE_KEY }}
@@ -29,6 +27,19 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v2
 
+      # Add cache for yarn directory
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
       - name: Patch node gyp on windows to support Visual Studio 2019
         if: startsWith(matrix.os, 'windows')
         shell: powershell
@@ -69,21 +80,21 @@ jobs:
           release: ${{ startsWith(github.ref, 'refs/tags/v') }}
 
       - name: 'Upload Artifacts OSX'
-        if: contains(github.ref, 'master') && startsWith(matrix.os, 'macos')
+        if: contains(github.ref, 'development') && startsWith(matrix.os, 'macos')
         uses: actions/upload-artifact@v2
         with:
           name: Desktop OSX
           path: ./dist/Safe[ ]Multisig*.dmg
 
       - name: 'Upload Artifacts Linux'
-        if: contains(github.ref, 'master') && startsWith(matrix.os, 'ubuntu')
+        if: contains(github.ref, 'development') && startsWith(matrix.os, 'ubuntu')
         uses: actions/upload-artifact@v2
         with:
           name: Desktop Linux
           path: ./dist/Safe[ ]Multisig*.AppImage
 
       - name: 'Upload Artifacts Windows'
-        if: contains(github.ref, 'master') && startsWith(matrix.os, 'windows')
+        if: contains(github.ref, 'development') && startsWith(matrix.os, 'windows')
         uses: actions/upload-artifact@v2
         with:
           name: Desktop Windows

package.json

@@ -255,9 +255,9 @@
     "cross-env": "^7.0.2",
     "dotenv": "^8.2.0",
     "dotenv-expand": "^5.1.0",
-    "electron": "7.2.4",
+    "electron": "9.3.0",
     "electron-builder": "22.8.0",
-    "electron-notarize": "0.3.0",
+    "electron-notarize": "1.0.0",
     "eslint": "6.8.0",
     "eslint-config-prettier": "6.11.0",
     "eslint-plugin-import": "2.22.0",

public/electron.js

@@ -142,6 +142,10 @@ process.on('uncaughtException',function(error){
 
 app.userAgentFallback = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) old-airport-include/1.0.0 Chrome Electron/7.1.7 Safari/537.36';
 
+// We have one non-context-aware module in node_modules/usb. This is used by @ledgerhq/hw-transport-node-hid
+// This type of modules will be impossible to use after electron 10
+app.allowRendererProcessReuse = false;
+
 app.commandLine.appendSwitch('ignore-certificate-errors');
 app.on("ready", () =>{
   // Hide the menu

yarn.lock

@@ -7752,13 +7752,13 @@ electron-log@4.2.4:
   resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.2.4.tgz#a13e42a9fc42ca2cc7d2603c3746352efa82112e"
   integrity sha512-CXbDU+Iwi+TjKzugKZmTRIORIPe3uQRqgChUl19fkW/reFUn5WP7dt+cNGT3bkLV8xfPilpkPFv33HgtmLLewQ==
 
-electron-notarize@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.3.0.tgz#b93c606306eac558b250c78ff95273ddb9fedf0a"
-  integrity sha512-tuDw8H0gcDOalNLv6RM2CwGvUXU60MPGZRDEmd0ppX+yP5XqL8Ec2DuXyz9J7WQSA3aRCfzIgH8C5CAivDYWMw==
+electron-notarize@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"
+  integrity sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==
   dependencies:
     debug "^4.1.1"
-    fs-extra "^8.1.0"
+    fs-extra "^9.0.1"
 
 electron-publish@22.8.0:
   version "22.8.0"
@@ -7809,10 +7809,10 @@ electron-updater@4.3.4:
     lodash.isequal "^4.5.0"
     semver "^7.3.2"
 
-electron@7.2.4:
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.4.tgz#9fc0446dae23ead897af8742470cb18da55c6ce9"
-  integrity sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg==
+electron@9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-9.3.0.tgz#a4f3dc17f31acc6797eb4c2c4bd0d0e25efb939b"
+  integrity sha512-7zPLEZ+kOjVJqfawMQ0vVuZZRqvZIeiID3tbjjbVybbxXIlFMpZ2jogoh7PV3rLrtm+dKRfu7Qc4E7ob1d0FqQ==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"