electron win (#46)

* window electron release * patch version * fix ico size * release 0.2.4 * change job Co-authored-by: mrval <kbenrafik@gmail.com>
zer0-os · May 13, 2022 · b7d0fb0 · b7d0fb0
1 parent f9d562d
commit b7d0fb0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/development-electron.yml b/.github/workflows/development-electron.yml
@@ -16,7 +16,7 @@ jobs:
       - run: echo '//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}' >> .npmrc
       - run: npm install
       - run: npm run test
-  release_osx:
+  electron_release:
     permissions: write-all
     needs: test
     runs-on: macOS-latest
@@ -38,7 +38,7 @@ jobs:
           node-version: '16'
       - run: echo '//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}' >> .npmrc
       - run: npm install
-      - name: Build/Release Electron Zer0
+      - name: Build/Release electron
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npm run electron:package:mac:publish
+        run: npm run electron:package:publish
diff --git a/electron/assets/images/zero-white-icon.ico b/electron/assets/images/zero-white-icon.ico
diff --git a/electron/electron-builder-config.js b/electron/electron-builder-config.js
@@ -17,6 +17,9 @@ module.exports = function () {
       icon: 'electron/assets/images/zero-white-icon.icns',
       target: ['dmg', 'zip'],
     },
+    win: {
+      icon: 'electron/assets/images/zero-white-icon.ico',
+    },
   };
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zOS",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "private": true,
   "homepage": "./",
   "main": "./public/electron.js",
@@ -48,8 +48,8 @@
     "test": "craco test --env=node",
     "eject": "react-scripts eject",
     "electron:start": "concurrently -k \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && electronmon .\"",
+    "electron:package:publish": "craco build && electron-builder -m -w -c.extraMetadata.main=build/electron.js --config electron/electron-builder-config.js --publish=always",
     "electron:package:mac": "craco build && electron-builder -m -c.extraMetadata.main=build/electron.js",
-    "electron:package:mac:publish": "craco build && electron-builder -m -c.extraMetadata.main=build/electron.js --config electron/electron-builder-config.js --publish=always",
     "electron:package:win": "craco build && electron-builder -w -c.extraMetadata.main=build/electron.js",
     "electron:package:linux": "craco build && electron-builder -l -c.extraMetadata.main=build/electron.js"
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,9 @@ module.exports = function () { @@
           icon: 'electron/assets/images/zero-white-icon.icns',
           target: ['dmg', 'zip'],
         },
+        win: {
+          icon: 'electron/assets/images/zero-white-icon.ico',
+        },
       };
     };
@@ Expand Down @@